Gitiles
Code Review Sign In
gerrit.twrp.me / android_bootable_recovery / 1a0929cc8aac532dba00b3c98cea22715719a421
commit1a0929cc8aac532dba00b3c98cea22715719a421[log] [tgz]
authorDavid Zeuthen <zeuthen@google.com>Mon Aug 07 18:47:27 2017 -0400
committerDavid Zeuthen <zeuthen@google.com>Tue Aug 08 12:48:43 2017 -0400
tree9043a3923bdfc553ff189468e83b9326d3b60279
parentf49cc02e86f5c0ccda2b9979a004670cf559c050 [diff]
update_verifier: Support androidboot.veritymode being empty or 'disabled'.

Bootloaders using libavb will set androidboot.veritymode=disabled if
the "disable dm-verity" flag has been set. Additionally if the
"disable verification" flag is set androidboot.veritymode will not be
set at all. Handle both cases.

Without this fix we'll end up in a bootloop.

Test: Manually tested on a device using AVB.
Bug: 64315394
Change-Id: I8310849e347248f4a96158838310f688ecef4211
1 file changed
tree: 9043a3923bdfc553ff189468e83b9326d3b60279
  1. applypatch/
  2. boot_control/
  3. bootloader_message/
  4. edify/
  5. etc/
  6. fonts/
  7. minadbd/
  8. minui/
  9. otafault/
  10. otautil/
  11. private/
  12. res-hdpi/
  13. res-mdpi/
  14. res-xhdpi/
  15. res-xxhdpi/
  16. res-xxxhdpi/
  17. tests/
  18. tools/
  19. uncrypt/
  20. update_verifier/
  21. updater/
  22. res-560dpi ⇨ res-xxxhdpi
  23. .clang-format
  24. adb_install.cpp
  25. adb_install.h
  26. Android.bp
  27. Android.mk
  28. asn1_decoder.cpp
  29. asn1_decoder.h
  30. bootloader.h
  31. CleanSpec.mk
  32. common.h
  33. default_device.cpp
  34. device.cpp
  35. device.h
  36. error_code.h
  37. fuse_sdcard_provider.cpp
  38. fuse_sdcard_provider.h
  39. fuse_sideload.cpp
  40. fuse_sideload.h
  41. install.cpp
  42. install.h
  43. interlace-frames.py
  44. mounts.cpp
  45. mounts.h
  46. NOTICE
  47. OWNERS
  48. print_sha1.h
  49. README.md
  50. recovery-persist.cpp
  51. recovery-persist.rc
  52. recovery-refresh.cpp
  53. recovery-refresh.rc
  54. recovery.cpp
  55. roots.cpp
  56. roots.h
  57. rotate_logs.cpp
  58. rotate_logs.h
  59. screen_ui.cpp
  60. screen_ui.h
  61. stub_ui.h
  62. ui.cpp
  63. ui.h
  64. verifier.cpp
  65. verifier.h
  66. vr_device.cpp
  67. vr_ui.cpp
  68. vr_ui.h
  69. wear_touch.cpp
  70. wear_touch.h
  71. wear_ui.cpp
  72. wear_ui.h
README.md

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.