Gitiles
Code Review Sign In
gerrit.twrp.me / android_bootable_recovery / 6957555e295e8ae34ba5e8cfbfb1c7bd76b0024d
commit6957555e295e8ae34ba5e8cfbfb1c7bd76b0024d[log] [tgz]
authorTianjie Xu <xunchang@google.com>Tue May 16 15:51:46 2017 -0700
committerTianjie Xu <xunchang@google.com>Tue May 23 17:36:56 2017 -0700
tree6ccc20bb5be3a08af14e1c56dbf332decb6eafe2
parent1f9808bd4856122924c9453d871d34fd777d5389 [diff]
Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails

We have seen one case when bspatch failed likely due to patch
corruption. Since the package has passed verification before, we want
to reboot and retry the patch command again since there's no
alternative for users.

We won't delete the stash before reboot, and the src has passed SHA1
check. If there's an error on the patch, it will fail the package
verification during retry.

Bug: 37855643
Test: angler reboots and retries the update when bspatch fails.
Change-Id: I2ebac9621bd1f0649bb301b9a28a0dd079ed4e1d
4 files changed
tree: 6ccc20bb5be3a08af14e1c56dbf332decb6eafe2
  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. print_sha1.h
  48. README.md
  49. recovery-persist.cpp
  50. recovery-persist.rc
  51. recovery-refresh.cpp
  52. recovery-refresh.rc
  53. recovery.cpp
  54. roots.cpp
  55. roots.h
  56. rotate_logs.cpp
  57. rotate_logs.h
  58. screen_ui.cpp
  59. screen_ui.h
  60. stub_ui.h
  61. ui.cpp
  62. ui.h
  63. verifier.cpp
  64. verifier.h
  65. wear_touch.cpp
  66. wear_touch.h
  67. wear_ui.cpp
  68. 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.