No description
Find a file
David Anderson c9548fce84 Merge "bootloader_message: Carve out space reserved for system." am: 8243388d57 am: bf23ee57e4
am: 1caaf16379

Change-Id: I55cf76a792a593e05e22b504998bd4fb3ef2189d
2019-11-05 14:43:29 -08:00
applypatch Moving recovery resources from /system to /vendor 2019-10-04 00:04:56 +00:00
boot_control bootable: leak less memory 2019-10-23 12:09:07 -07:00
bootloader_message bootloader_message: Carve out space reserved for system. 2019-11-04 15:57:04 -08:00
edify Moving recovery resources from /system to /vendor 2019-10-04 00:04:56 +00:00
etc Start adbd in user mode if bootloader is unlocked 2019-10-30 10:26:56 -07:00
fastboot recovery: report compliant reboot reason (Part Deux) 2019-05-23 13:58:53 -07:00
fonts more font improvements and cleanup 2013-03-07 13:34:24 -08:00
fuse_sideload Support starting fuse from a block map 2019-06-20 13:53:40 -07:00
install Force package installation with FUSE unless the package stores on device 2019-10-16 11:35:17 -07:00
minadbd Use adbd_system_binaries to track adbd's dependencies. 2019-10-23 14:33:51 -07:00
minui minui: Support input device hotplug in recovery mode. 2019-08-14 14:18:58 -07:00
misc_writer Add misc_writer. 2019-05-20 15:51:26 -07:00
otautil Moving recovery resources from /system to /vendor 2019-10-04 00:04:56 +00:00
recovery_ui Remove common.h 2019-08-15 13:40:16 -07:00
recovery_utils [bootable][recovery] fix -Wreorder-init-list 2019-10-10 16:33:58 -07:00
res-hdpi/images Add a logo to the fastbootd screen. 2019-02-11 19:22:03 -08:00
res-mdpi/images Add a logo to the fastbootd screen. 2019-02-11 19:22:03 -08:00
res-xhdpi/images Add a logo to the fastbootd screen. 2019-02-11 19:22:03 -08:00
res-xxhdpi/images Add a logo to the fastbootd screen. 2019-02-11 19:22:03 -08:00
res-xxxhdpi/images Add a logo to the fastbootd screen. 2019-02-11 19:22:03 -08:00
tests Merge "Force package installation with FUSE unless the package stores on device" 2019-10-16 22:20:27 +00:00
tools Import translations. DO NOT MERGE 2019-09-24 14:36:40 -07:00
uncrypt Add android::fs_mgr namespace for new Fstab code 2019-01-31 09:00:40 -08:00
update_verifier Append -verity when looking for verity device-mapper names. 2019-04-01 17:13:11 -07:00
updater Run BORINGSSL_self_test() in updater_main 2019-10-05 17:06:48 -07:00
updater_sample Update OWNERS. 2019-10-08 20:32:42 -07:00
.clang-format Document the clang-format usage. 2018-05-10 13:12:59 -07:00
Android.bp Merge "Force package installation with FUSE unless the package stores on device" 2019-10-16 22:20:27 +00:00
Android.mk e2fsck_static is no longer needed for remount 2019-01-16 23:42:55 +00:00
bootloader.h Create bootloader_message static library. 2016-06-30 11:02:38 -07:00
CleanSpec.mk Moving recovery resources from /system to /vendor 2019-10-04 00:04:56 +00:00
fsck_unshare_blocks.cpp otautil: Factor out the utils that're private to recovery. 2019-10-02 10:56:46 -07:00
fsck_unshare_blocks.h recovery: add --fsck_unshare_blocks option for adb remount 2018-05-30 13:24:30 -07:00
interlace-frames.py Go back to the old ear-wiggling Android animation. 2016-04-21 14:26:14 -07:00
NOTICE Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:42 -07:00
OWNERS Update OWNERS. 2019-10-08 20:32:42 -07:00
PREUPLOAD.cfg Add tools/ to the style-checking path. 2018-11-06 11:27:13 -08:00
README.md Update the instruction for building recovery image on Pixels. 2019-09-12 13:10:44 -07:00
recovery-persist.cpp otautil: Factor out the utils that're private to recovery. 2019-10-02 10:56:46 -07:00
recovery-persist.rc recovery: reduce overall boot time 2017-09-18 13:55:32 -07:00
recovery-refresh.cpp otautil: Factor out the utils that're private to recovery. 2019-10-02 10:56:46 -07:00
recovery-refresh.rc recovery: reduce overall boot time 2017-09-18 13:55:32 -07:00
recovery.cpp Merge "Force package installation with FUSE unless the package stores on device" 2019-10-16 22:20:27 +00:00
recovery.h Move librecovery_ui to a sub-directory 2019-03-21 10:46:11 -07:00
recovery_main.cpp Start adbd in user mode if bootloader is unlocked 2019-10-30 10:26:56 -07:00
TEST_MAPPING tests: Merge recovery_component_test into recovery_unit_test. 2019-04-30 09:13:36 -07:00

The Recovery Image

Quick turn-around testing

  • Devices using recovery-as-boot (e.g. Pixels, which set BOARD_USES_RECOVERY_AS_BOOT)

    # After setting up environment and lunch.
    m -j bootimage
    adb reboot bootloader
    
    # Pixel devices don't support booting into recovery mode with `fastboot boot`.
    fastboot flash boot
    
    # Manually choose `Recovery mode` from bootloader menu.
    
  • Devices with a separate recovery image (e.g. Nexus)

    # After setting up environment and lunch.
    mm -j && m ramdisk-nodeps && m recoveryimage-nodeps
    adb reboot bootloader
    
    # To boot into the new recovery image without flashing the recovery partition:
    fastboot boot $ANDROID_PRODUCT_OUT/recovery.img
    

Running the tests

# After setting up environment and lunch.
mmma -j bootable/recovery

# Running the tests on device (under normal boot).
adb root
adb sync data

# 32-bit device
adb shell /data/nativetest/recovery_unit_test/recovery_unit_test

# Or 64-bit device
adb shell /data/nativetest64/recovery_unit_test/recovery_unit_test

Running the manual tests

recovery-refresh and recovery-persist executables exist only on systems without /cache partition. And we need to follow special steps to run tests for them.

  • Execute the test on an A/B device first. The test should fail but it will log some contents to pmsg.

  • Reboot the device immediately and run the test again. The test should save the contents of pmsg buffer into /data/misc/recovery/inject.txt. Test will pass if this file has expected contents.

Using adb under recovery

When running recovery image from debuggable builds (i.e. -eng or -userdebug build variants, or ro.debuggable=1 in /prop.default), adbd service is enabled and started by default, which allows adb communication. A device should be listed under adb devices, either in recovery or sideload state.

$ adb devices
List of devices attached
1234567890abcdef    recovery

Although /system/bin/adbd is built from the same code base as the one in the normal boot, only a subset of adb commands are meaningful under recovery, such as adb root, adb shell, adb push, adb pull etc. Since Android Q, adb shell no longer requires manually mounting /system from recovery menu.

Troubleshooting

adb devices doesn't show the device.

$ adb devices
List of devices attached
  • Ensure adbd is built and running.

By default, adbd is always included into recovery image, as /system/bin/adbd. init starts adbd service automatically only in debuggable builds. This behavior is controlled by the recovery specific /init.rc, whose source code is at bootable/recovery/etc/init.rc.

The best way to confirm a running adbd is by checking the serial output, which shows a service start log as below.

[   18.961986] c1      1 init: starting service 'adbd'...
  • Ensure USB gadget has been enabled.

If adbd service has been started but device not shown under adb devices, use lsusb(8) (on host) to check if the device is visible to the host.

bootable/recovery/etc/init.rc disables Android USB gadget (via sysfs) as part of the fs action trigger, and will only re-enable it in debuggable builds (the on property rule will always run after on fs).

on fs
    write /sys/class/android_usb/android0/enable 0

# Always start adbd on userdebug and eng builds
on property:ro.debuggable=1
    write /sys/class/android_usb/android0/enable 1
    start adbd

If device is using configfs, check if configfs has been properly set up in init rc scripts. See the example configuration for Pixel 2 devices. Note that the flag set via sysfs (i.e. the one above) is no-op when using configfs.

adb devices shows the device, but in unauthorized state.

$ adb devices
List of devices attached
1234567890abcdef    unauthorized

recovery image doesn't honor the USB debugging toggle and the authorizations added under normal boot (because such authorization data stays in /data, which recovery doesn't mount), nor does it support authorizing a host device under recovery. We can use one of the following options instead.

  • Option 1 (Recommended): Authorize a host device with adb vendor keys.

For debuggable builds, an RSA keypair can be used to authorize a host device that has the private key. The public key, defined via PRODUCT_ADB_KEYS, will be copied to /adb_keys. When starting the host-side adbd, make sure the filename (or the directory) of the matching private key has been added to $ADB_VENDOR_KEYS.

$ export ADB_VENDOR_KEYS=/path/to/adb/private/key
$ adb kill-server
$ adb devices

-user builds filter out PRODUCT_ADB_KEYS, so no /adb_keys will be included there.

Note that this mechanism applies to both of normal boot and recovery modes.

  • Option 2: Allow adbd to connect without authentication.
    • adbd is compiled with ALLOW_ADBD_NO_AUTH (only on debuggable builds).
    • ro.adb.secure has a value of 0.

Both of the two conditions need to be satisfied. Although ro.adb.secure is a runtime property, its value is set at build time (written into /prop.default). It defaults to 1 on -user builds, and 0 for other build variants. The value is overridable via PRODUCT_DEFAULT_PROPERTY_OVERRIDES.