No description
Find a file
Jerry Zhang 3528139409 Merge "recovery: Add ability to interrupt UI"
am: 561ee9362c

Change-Id: Ic33767a7ebaac6c066c0552b502a361b5c498b9e
2018-07-30 16:16:26 -07:00
applypatch applypatch: Change applypatch command-line arguments. 2018-07-20 11:26:17 -07:00
boot_control Drop -Wno-unused-parameter. 2017-10-11 16:56:12 -07:00
bootloader_message bootloader_message: Build libbootloader_message as shared lib. 2018-07-25 13:42:33 -07:00
edify Merge "edify: Rename parse_string to ParseString and let it take std::string." 2018-07-10 16:38:08 +00:00
etc Move recovery from /sbin to /system/bin 2018-07-26 17:12:40 -07:00
fonts more font improvements and cleanup 2013-03-07 13:34:24 -08:00
fuse_sideload Revert "Make recovery libraries shared / recovery_available" 2018-07-23 17:49:14 +00:00
minadbd minadbd: avoid overrriding services_to_fd. 2018-07-27 11:18:30 -07:00
minui minui/drm: wait for page flip completion 2018-07-03 17:43:06 +00:00
otafault Disable building libapplypatch on mac 2018-02-17 22:06:31 -08:00
otautil Revert "Make recovery libraries shared / recovery_available" 2018-07-23 17:49:14 +00:00
private Drop the dependency on AB_OTA_UPDATER flag. 2018-06-19 10:50:43 -07:00
res-hdpi/images update the recovery background image with new translation 2017-09-19 23:36:28 -07:00
res-mdpi/images update the recovery background image with new translation 2017-09-19 23:36:28 -07:00
res-xhdpi/images update the recovery background image with new translation 2017-09-19 23:36:28 -07:00
res-xxhdpi/images update the recovery background image with new translation 2017-09-19 23:36:28 -07:00
res-xxxhdpi/images update the recovery background image with new translation 2017-09-19 23:36:28 -07:00
tests Merge "recovery: Add ability to interrupt UI" 2018-07-30 16:16:26 -07:00
tools Merge "tools: Move to Soong." am: 6b16093b29 2018-05-29 11:09:10 -07:00
uncrypt f2fs: support f2fs by setting unmovable bit for package file 2018-03-22 12:10:08 -07:00
update_verifier Add proto3 support for care_map 2018-07-25 14:15:22 -07:00
updater Merge "applypatch: Consolidate CacheSizeCheck() and MakeFreeSpaceOnCache()." 2018-07-13 12:48:45 -07:00
updater_sample updater_sample: add privileged system app docs 2018-06-18 10:31:18 -07:00
.clang-format Document the clang-format usage. 2018-05-10 13:12:59 -07:00
adb_install.cpp Move recovery from /sbin to /system/bin 2018-07-26 17:12:40 -07:00
adb_install.h Rename CacheLocation to Paths. 2018-04-25 21:46:00 -07:00
Android.bp recovery: Refactor logging code into logging.cpp 2018-05-07 14:14:17 -07:00
Android.mk Merge "Move recovery from /sbin to /system/bin" 2018-07-27 13:34:20 -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 recovery: Refactor common setup into main() 2018-05-16 19:32:06 +00:00
default_device.cpp Auto-detect whether to use the long-press UI. 2015-04-10 15:14:35 -07:00
device.cpp recovery: Configure device menu based on runtime info. 2018-05-10 20:46:46 -07:00
device.h recovery: Add ability to interrupt UI 2018-07-30 20:17:27 +00:00
fsck_unshare_blocks.cpp Recovery image is self-contained 2018-06-07 23:24:33 +09: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 Drop the dependency on AB_OTA_UPDATER flag. 2018-06-19 10:50:43 -07:00
install.h Rename CacheLocation to Paths. 2018-04-25 21:46:00 -07:00
interlace-frames.py Go back to the old ear-wiggling Android animation. 2016-04-21 14:26:14 -07:00
logging.cpp recovery: Refactor logging code into logging.cpp 2018-05-07 14:14:17 -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 Rename the dir for SystemUpdaterSample. 2018-04-25 15:34:37 -07:00
README.md Document instructions for using adb under recovery. 2018-02-07 20:55:33 -08:00
recovery-persist.cpp recovery: Refactor logging code into logging.cpp 2018-05-07 14:14:17 -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 Merge "recovery: Add ability to interrupt UI" 2018-07-30 16:16:26 -07:00
recovery.h recovery: Refactor common setup into main() 2018-05-16 19:32:06 +00:00
recovery_main.cpp Fix the arguments passed to getopt_long(3). 2018-07-17 12:16:53 -07:00
res-560dpi Make text for recovery larger on angler 2016-05-02 12:20:04 -07:00
roots.cpp Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" 2018-06-20 15:24:29 -07:00
roots.h roots: Fix an issue with volume_for_path(). 2017-10-02 11:18:13 -07:00
screen_ui.cpp recovery: Add ability to interrupt UI 2018-07-30 20:17:27 +00:00
screen_ui.h recovery: c++ify pthread use in UI 2018-05-29 15:20:58 -07:00
stub_ui.h recovery: Add ability to set title lines 2018-05-21 16:37:07 -07:00
ui.cpp recovery: Add ability to interrupt UI 2018-07-30 20:17:27 +00:00
ui.h recovery: Add ability to interrupt UI 2018-07-30 20:17:27 +00:00
verifier.cpp Move rangeset.h and print_sha1.h into otautil. 2017-10-10 15:52:11 -07:00
verifier.h Const modifiers 2017-03-23 21:52:30 +01:00
vr_device.cpp Introduce VR recovery ui 2017-06-16 15:33:02 -07:00
vr_ui.cpp screen_ui: Use std::string in DrawTextLine() and siblings. 2018-05-02 15:32:48 -07:00
vr_ui.h screen_ui: Use std::string in DrawTextLine() and siblings. 2018-05-02 15:32:48 -07:00
wear_device.cpp Allow customizing WearRecoveryUI via Makefile variables. 2017-08-10 09:31:17 -07:00
wear_ui.cpp Updates Wear UI to Display Localized Recovery Text. 2018-07-20 11:31:53 -07:00
wear_ui.h Move menu headers/items to std::vector<std::string>. 2018-05-03 12:31:18 -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.

ResourceTest validates whether the png files are qualified as background text image under recovery.

1. `adb sync data` to make sure the test-dir has the images to test.
2. The test will automatically pickup and verify all `_text.png` files in
   the test dir.

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 /sbin/adbd shares the same binary between normal boot and recovery images, only a subset of adb commands are meaningful under recovery, such as adb root, adb shell, adb push, adb pull etc. adb shell works only after manually mounting /system from recovery menu (assuming a valid system image on device).

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 /sbin/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.