Merge tag 'android-10.0.0_r25' into aosp10-4

Android 10.0.0 release 25
tree: aaca5e89b07750f9946c95897cb5226be9a5a812
  1. .github/
  2. adbbu/
  3. applypatch/
  4. attr/
  5. bmlutils/
  6. boot_control/
  7. bootloader_message/
  8. bootloader_message_twrp/
  9. crypto/
  10. dosfstools/
  11. edify/
  12. etc/
  13. exfat/
  14. fastboot/
  15. fb2png/
  16. flashutils/
  17. fonts/
  18. fuse/
  19. fuse_sideload/
  20. gpt/
  21. gui/
  22. htcdumlock/
  23. injecttwrp/
  24. install/
  25. libblkid/
  26. libcrecovery/
  27. libmincrypt/
  28. libpixelflinger/
  29. libtar/
  30. minadbd/
  31. minadbd21/
  32. minui/
  33. minui21/
  34. minuitwrp/
  35. minzip/
  36. misc_writer/
  37. mmcutils/
  38. mtdutils/
  39. mtp/
  40. openaes/
  41. orscmd/
  42. otafault/
  43. otautil/
  44. pigz/
  45. prebuilt/
  46. recovery_ui/
  47. res/
  48. res-hdpi/
  49. res-mdpi/
  50. res-xhdpi/
  51. res-xxhdpi/
  52. res-xxxhdpi/
  53. scripts/
  54. sepolicy/
  55. simg2img/
  56. tests/
  57. toolbox/
  58. tools/
  59. toybox/
  60. twrpDigest/
  61. twrpTarMain/
  62. uncrypt/
  63. update_verifier/
  64. updater/
  65. updater_sample/
  66. verifier24/
  67. .clang-format
  68. .gitignore
  69. adb_install.cpp
  70. Android.bp
  72. BasePartition.cpp
  73. bootloader.h
  75. common.h
  76. data.cpp
  77. data.hpp
  78. exclude.cpp
  79. exclude.hpp
  80. find_file.cpp
  81. find_file.hpp
  82. fixContexts.cpp
  83. fixContexts.hpp
  84. fsck_unshare_blocks.cpp
  85. fsck_unshare_blocks.h
  86. fuse.h
  87. fuse_sideload22.cpp
  88. fuse_sideload22.h
  89. infomanager.cpp
  90. infomanager.hpp
  91. installcommand.cpp
  92. installcommand.h
  94. legacy_properties.h
  95. legacy_property_service.cpp
  96. legacy_property_service.h
  97. mounts.c
  98. NOTICE
  99. openrecoveryscript.cpp
  100. openrecoveryscript.hpp
  101. OWNERS
  102. partition.cpp
  103. partitionmanager.cpp
  104. partitions.hpp
  105. PREUPLOAD.cfg
  106. progresstracking.cpp
  107. progresstracking.hpp
  109. recovery-persist.cpp
  110. recovery-persist.rc
  111. recovery-refresh.cpp
  112. recovery-refresh.rc
  113. recovery.cpp
  114. recovery.h
  115. recovery_main.cpp
  116. recovery_ui.h
  117. rotate_logs.cpp
  118. set_metadata.cpp
  119. set_metadata.h
  120. tarWrite.c
  121. tarWrite.h
  122. tw_atomic.cpp
  123. tw_atomic.hpp
  124. twcommon.h
  125. twinstall.cpp
  126. twinstall.h
  127. twinstallorig.cpp
  128. twinstallorig.h
  129. twrp-functions.cpp
  130. twrp-functions.hpp
  131. twrp.cpp
  132. twrpAdbBuFifo.cpp
  133. twrpAdbBuFifo.hpp
  134. twrpDigestDriver.cpp
  135. twrpDigestDriver.hpp
  136. twrpTar.cpp
  137. twrpTar.h
  138. twrpTar.hpp
  139. variables.h
  140. verifier.h
  141. zipwrap.cpp
  142. zipwrap.hpp

Team Win Recovery Project (TWRP)

<<<<<<< HEAD You can find a compiling guide here.

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.


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).
    • has a value of 0.

Both of the two conditions need to be satisfied. Although 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.