No description
Find a file
Xin Li fabb0fbef5 [automerger skipped] Merge "Merge Android R" am: 2172474d50 -s ours am: c975ecfe33 -s ours am: 4b028fac0b -s ours am: 37059f4ee5 -s ours
am skip reason: Change-Id I22ea459266eeb88509fefb34277e6426166e2502 with SHA-1 e1e08fc8d1 is in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1421705

Change-Id: Ic3307da2b882e5ca73f57ecfe5e0652bba870d7b
2020-09-11 03:58:41 +00:00
applypatch Update language to comply with Android’s inclusive language guidance 2020-07-23 14:02:21 -07:00
bootloader_message Move libboot_control to boot_control 1.1 2020-02-26 12:14:54 -08:00
edify Add add_slot_suffix function. 2020-05-19 15:20:14 -07:00
etc Do not execute linkerconfig from recovery 2019-12-17 15:05:54 +09:00
fastboot Add EthernetDevice to manage ethernet connection. 2020-05-15 15:18:41 -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 Add recovery support of dynamic fingerprints 2020-06-29 16:22:08 -04:00
minadbd Fix flaky tests by require root for minadbd_tests 2020-08-24 14:36:01 -04:00
minui Fix ioctl FIONREAD call parameters to use int instead of size_t 2020-01-13 16:04:44 -08:00
otautil Fix some wording to comply with respectful-code 2020-07-23 13:07:24 -07:00
recovery_ui Merge "recovery: fastbootd: retry opening graphics" 2020-05-19 12:47:19 +00:00
recovery_utils Rename external storage properties. 2020-04-16 10:10:59 +02: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 Update language to comply with Android’s inclusive language guidance 2020-07-23 14:02:21 -07:00
tools Import translations. DO NOT MERGE 2020-03-25 10:29:41 -07:00
uncrypt Fix clang-analyzer-core.uninitialized.Branch warnings 2020-04-23 14:36:59 -07:00
update_verifier Clear the warm_reset flag after boot is successful 2019-11-14 17:43:56 -08:00
updater Fix some wording to comply with respectful-code 2020-07-23 13:07:24 -07:00
updater_sample updater_sample: add internet access permission 2019-12-10 14:49:57 +08:00
.clang-format Add add_slot_suffix function. 2020-05-19 15:20:14 -07:00
Android.bp Merge "Add missing dep." am: 29a1d00035 am: 58af72a568 2020-04-17 01:21:23 +00:00
Android.mk Add EthernetDevice to manage ethernet connection. 2020-05-15 15:18:41 -07: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
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 Add elsk@ to OWNERS 2020-01-07 11:35:06 -08: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 Retire the Tron metrics reporting for non-A/B update 2020-01-16 15:17:41 -08: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 "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d 2020-08-18 03:33:23 +00:00
recovery.h Move librecovery_ui to a sub-directory 2019-03-21 10:46:11 -07:00
recovery_main.cpp Add EthernetDevice to manage ethernet connection. 2020-05-15 15:18:41 -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.