No description
Find a file
Bill Yi 6e186a155f [automerger skipped] Import translations. DO NOT MERGE am: 00ab5cd4f7 -s ours
am: b15357267f  -s ours

Change-Id: I06cacb795cfaca029e65e1d593b290efa57c32b9
2018-12-11 15:59:49 -08:00
applypatch applypatch: {Load,Save}FileContents return bool values. 2018-08-31 14:31:19 -07:00
boot_control Build boot control HAL with Android.bp 2018-08-09 22:15:01 -07:00
bootloader_message Move some small users of fstab to new C++ Fstab 2018-12-04 11:11:14 -08:00
edify Merge "edify: Rename parse_string to ParseString and let it take std::string." 2018-07-10 16:38:08 +00:00
etc Fix sideload for user devices by adding a new sideload config 2018-09-07 15:02:43 -07:00
fastboot Add fastboot mode to recovery 2018-08-13 21:18:18 -07:00
fonts more font improvements and cleanup 2013-03-07 13:34:24 -08:00
fuse_sideload Build recovery with Soong. 2018-08-10 14:43:27 -07:00
minadbd C++17 is the default now. 2018-12-03 09:27:17 -08:00
minui minui: GRSurface::Create() computes data_size on its own. 2018-11-26 22:46:19 -08:00
otautil Move the parse of last_install to recovery-persist 2018-09-13 13:27:55 -07:00
private Drop the dependency on AB_OTA_UPDATER flag. 2018-06-19 10:50:43 -07:00
res-hdpi/images Further compress the recovery animation file 2018-08-15 19:07:08 +00:00
res-mdpi/images Further compress the recovery animation file 2018-08-15 19:07:08 +00:00
res-xhdpi/images Further compress the recovery animation file 2018-08-15 19:07:08 +00:00
res-xxhdpi/images Further compress the recovery animation file 2018-08-15 19:07:08 +00:00
res-xxxhdpi/images Further compress the recovery animation file 2018-08-15 19:07:08 +00:00
tests tests: Temporarily disable ScreenRecoveryUITest tests. 2018-12-06 13:05:05 -08:00
tools Import translations. DO NOT MERGE 2018-12-11 20:33:09 +00:00
uncrypt uncrypt: Fix the comparison in FindBlockDevice(). 2018-12-05 14:44:32 -08:00
update_verifier Compare the fingerprint before reading the partition 2018-10-04 16:42:57 -07:00
updater make_f2fs: use -g android by default 2018-11-21 12:53:09 -08:00
updater_sample Fix instrumentation_for to refer to name of module 2018-10-17 15:14:31 -07:00
.clang-format Document the clang-format usage. 2018-05-10 13:12:59 -07:00
adb_install.cpp Fix sideload for user devices by adding a new sideload config 2018-09-07 15:02:43 -07:00
adb_install.h Rename CacheLocation to Paths. 2018-04-25 21:46:00 -07:00
Android.bp C++17 is the default now. 2018-12-03 09:27:17 -08:00
Android.mk Move the parse of last_install to recovery-persist 2018-09-13 13:27:55 -07:00
asn1_decoder.cpp Checking unsigned variable less than zero 2017-03-23 17:07:39 +01:00
asn1_decoder.h Refactor asn1_decoder functions into a class. 2017-03-21 15:17:43 -07:00
bootloader.h Create bootloader_message static library. 2016-06-30 11:02:38 -07:00
CleanSpec.mk recovery: minui: add adf backend 2014-04-25 15:47:34 -07:00
common.h Fix sideload for user devices by adding a new sideload config 2018-09-07 15:02:43 -07:00
default_device.cpp Auto-detect whether to use the long-press UI. 2015-04-10 15:14:35 -07:00
device.cpp Add fastboot mode to recovery 2018-08-13 21:18:18 -07:00
device.h Add fastboot mode to recovery 2018-08-13 21:18:18 -07:00
fsck_unshare_blocks.cpp Fix ensure_path_mounted_at for fsck_unshare_blocks 2018-11-30 15:22:19 -08:00
fsck_unshare_blocks.h recovery: add --fsck_unshare_blocks option for adb remount 2018-05-30 13:24:30 -07:00
fuse_sdcard_provider.cpp Clean up fuse_sideload and add a testcase. 2017-11-03 18:30:41 -07:00
fuse_sdcard_provider.h recovery: Fork a process for fuse when sideloading from SD card. 2016-01-13 21:29:20 -08:00
install.cpp Check and dump the signal info for killed updater. 2018-11-07 15:25:30 -08:00
install.h Refactor the code to check the metadata 2018-10-31 11:03:58 -07:00
interlace-frames.py Go back to the old ear-wiggling Android animation. 2016-04-21 14:26:14 -07:00
logging.cpp Move the parse of last_install to recovery-persist 2018-09-13 13:27:55 -07:00
logging.h recovery: Refactor logging code into logging.cpp 2018-05-07 14:14:17 -07:00
NOTICE Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:42 -07:00
OWNERS Fix owner email address. 2017-10-12 10:45:04 -07:00
PREUPLOAD.cfg Add tools/ to the style-checking path. 2018-11-06 11:27:13 -08:00
README.md Update README.md. 2018-11-27 13:47:13 -08:00
recovery-persist.cpp Move the parse of last_install to recovery-persist 2018-09-13 13:27:55 -07:00
recovery-persist.rc recovery: reduce overall boot time 2017-09-18 13:55:32 -07:00
recovery-refresh.cpp recovery: Refactor logging code into logging.cpp 2018-05-07 14:14:17 -07:00
recovery-refresh.rc recovery: reduce overall boot time 2017-09-18 13:55:32 -07:00
recovery.cpp SYSTEM_ROOT -> get_system_root 2018-11-27 15:57:47 -08:00
recovery.h recovery: Refactor common setup into main() 2018-05-16 19:32:06 +00:00
recovery_main.cpp Merge "logical -> dynamic partitions." 2018-11-16 23:35:28 +00:00
roots.cpp Merge "SYSTEM_ROOT -> get_system_root" 2018-11-30 22:07:24 +00:00
roots.h SYSTEM_ROOT -> get_system_root 2018-11-27 15:57:47 -08:00
screen_ui.cpp minui: GRSurface::Create() computes data_size on its own. 2018-11-26 22:46:19 -08:00
screen_ui.h ui: Manage loaded resources with smart pointers. 2018-11-05 10:15:59 -08:00
stub_ui.h Add function to show localized rescue party menu 2018-10-22 15:27:33 -07:00
ui.cpp ui: Only set brightness when needed. 2018-08-16 11:54:01 -07:00
ui.h Add function to show localized rescue party menu 2018-10-22 15:27:33 -07:00
verifier.cpp Remove the load_keys function 2018-10-24 23:26:59 +00:00
verifier.h Remove the load_keys function 2018-10-24 23:26:59 +00:00
vr_device.cpp Introduce VR recovery ui 2017-06-16 15:33:02 -07:00
vr_ui.cpp ui: Add constness to Draw- functions. 2018-10-23 10:56:54 -07:00
vr_ui.h ui: Add constness to Draw- functions. 2018-10-23 10:56:54 -07:00
wear_device.cpp Allow customizing WearRecoveryUI via Makefile variables. 2017-08-10 09:31:17 -07:00
wear_ui.cpp ui: Manage loaded resources with smart pointers. 2018-11-05 10:15:59 -08:00
wear_ui.h Add function to show localized rescue party menu 2018-10-22 15:27:33 -07:00

The Recovery Image

Quick turn-around testing

mm -j && m ramdisk-nodeps && m recoveryimage-nodeps

# To boot into the new recovery image
# without flashing the recovery partition:
adb reboot bootloader
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.
adb root
adb sync data

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

# Or 64-bit device
adb shell /data/nativetest64/recovery_unit_test/recovery_unit_test
adb shell /data/nativetest64/recovery_component_test/recovery_component_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.