edee8361d7
Allow "adb remount" on deduplicated filesystems to reboot into recovery and run e2fsck to undo deduplication. The e2fsck binary is copied from the system partition into tmpfs, and the system partition is unmounted so e2fsck can run safely. Bug: 64109868 Test: recovery with --fsck_unshare_blocks; adb remount Change-Id: I7558749b018b58f3c4339e51a95831dbd5be1ae3 |
||
---|---|---|
applypatch | ||
boot_control | ||
bootloader_message | ||
edify | ||
etc | ||
fonts | ||
fuse_sideload | ||
minadbd | ||
minui | ||
otafault | ||
otautil | ||
private | ||
res-hdpi/images | ||
res-mdpi/images | ||
res-xhdpi/images | ||
res-xxhdpi/images | ||
res-xxxhdpi/images | ||
tests | ||
tools | ||
uncrypt | ||
update_verifier | ||
updater | ||
updater_sample | ||
.clang-format | ||
adb_install.cpp | ||
adb_install.h | ||
Android.bp | ||
Android.mk | ||
asn1_decoder.cpp | ||
asn1_decoder.h | ||
bootloader.h | ||
CleanSpec.mk | ||
common.h | ||
default_device.cpp | ||
device.cpp | ||
device.h | ||
fsck_unshare_blocks.cpp | ||
fsck_unshare_blocks.h | ||
fuse_sdcard_provider.cpp | ||
fuse_sdcard_provider.h | ||
install.cpp | ||
install.h | ||
interlace-frames.py | ||
logging.cpp | ||
logging.h | ||
NOTICE | ||
OWNERS | ||
PREUPLOAD.cfg | ||
README.md | ||
recovery-persist.cpp | ||
recovery-persist.rc | ||
recovery-refresh.cpp | ||
recovery-refresh.rc | ||
recovery.cpp | ||
recovery.h | ||
recovery_main.cpp | ||
res-560dpi | ||
roots.cpp | ||
roots.h | ||
screen_ui.cpp | ||
screen_ui.h | ||
stub_ui.h | ||
ui.cpp | ||
ui.h | ||
verifier.cpp | ||
verifier.h | ||
vr_device.cpp | ||
vr_ui.cpp | ||
vr_ui.h | ||
wear_device.cpp | ||
wear_ui.cpp | ||
wear_ui.h |
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 withALLOW_ADBD_NO_AUTH
(only on debuggable builds).ro.adb.secure
has a value of0
.
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
.