Commit Graph

4476 Commits

Author SHA1 Message Date
Tao Bao f5cb2a11df Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87 am: 54f8988cfe
am: 7b2957ed25

Change-Id: Ia1dbea19d1975348a7dfdcaf803ebb6bf4b99a0a
2017-04-24 19:38:41 +00:00
Tao Bao 4983412270 Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8a am: f4a8d0bba6
am: b35fb1cf7b

Change-Id: Iba385b5435dc8aa4393821f8a72c92c477685f51
2017-04-24 19:38:29 +00:00
Tao Bao 4a1c086b8e Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d am: 0cf72f0f14 am: c179ac9238
am: d19fa968de

Change-Id: I567f2c85d02440e51dfd921c3e612d87bce3360e
2017-04-24 19:38:16 +00:00
Tao Bao 7b2957ed25 Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84 am: 5f85d07e87
am: 54f8988cfe

Change-Id: I389ced1ec0e90e90e5fbde74f1b0ab5449310ab7
2017-04-24 19:01:28 +00:00
Tao Bao b35fb1cf7b Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db am: 8a3325dc8a
am: f4a8d0bba6

Change-Id: If68b3e47fa75a5d5f2041bdda8a8f4cb84c8880c
2017-04-24 19:01:14 +00:00
Tao Bao d19fa968de Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d am: 0cf72f0f14
am: c179ac9238

Change-Id: I15f91cd1f14778fc23e3e7205145ea6fca98c2ca
2017-04-24 19:01:02 +00:00
Tao Bao 54f8988cfe Merge "Add more tests for verify_package_compatibility()." am: a9dd77fa84
am: 5f85d07e87

Change-Id: Iea6d09d9b99512727ceff40611e193e2009a0ba7
2017-04-24 18:48:14 +00:00
Tao Bao f4a8d0bba6 Merge "tests: Remove obsolete classes in applypatch_test." am: f17aa960db
am: 8a3325dc8a

Change-Id: I77c8a213052fd667f573b40e8a87fed0bb87676f
2017-04-24 18:48:02 +00:00
Tao Bao c179ac9238 Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." am: b6c9c41a3d
am: 0cf72f0f14

Change-Id: I79929b309cd9c465ef8f35f06df8469a77accec6
2017-04-24 18:47:50 +00:00
Tao Bao 5f85d07e87 Merge "Add more tests for verify_package_compatibility()."
am: a9dd77fa84

Change-Id: Ie0eeef3f0f188236b502d378140041931c2b7fb1
2017-04-24 18:39:35 +00:00
Tao Bao 8a3325dc8a Merge "tests: Remove obsolete classes in applypatch_test."
am: f17aa960db

Change-Id: I4e9f49255f8cdeb1bded80a578a82772c6ebb8c2
2017-04-24 18:39:17 +00:00
Tao Bao 0cf72f0f14 Merge "librecovery: Remove -Wno-unused-parameter and add -Wall."
am: b6c9c41a3d

Change-Id: I4ec01251132d6dc871cec19cf7c8577e33aac193
2017-04-24 18:39:02 +00:00
Tao Bao a9dd77fa84 Merge "Add more tests for verify_package_compatibility()." 2017-04-24 18:08:55 +00:00
Tao Bao f17aa960db Merge "tests: Remove obsolete classes in applypatch_test." 2017-04-24 18:01:02 +00:00
Tao Bao b6c9c41a3d Merge "librecovery: Remove -Wno-unused-parameter and add -Wall." 2017-04-24 18:00:26 +00:00
Tao Bao b24510cd60 librecovery: Remove -Wno-unused-parameter and add -Wall.
Test: mmma bootable/recovery
Change-Id: I5598d32bebb9dbda4a183a1502e0b7dc4918392e
2017-04-24 09:06:38 -07:00
Tianjie Xu 0965c583ef Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033 am: 0cd8986bc2
am: 05867dbecc

Change-Id: I41e9092a750acc7f71ec2d2fbd84cf2c98bb8f60
2017-04-22 00:37:19 +00:00
Tianjie Xu 05867dbecc Merge "Reboot the device on user build after the install fails" am: d6f436849d am: 4849c87033
am: 0cd8986bc2

Change-Id: I1c81003e76486748cbb02dd9d8fe11b167e4232b
2017-04-22 00:31:21 +00:00
Tianjie Xu 0cd8986bc2 Merge "Reboot the device on user build after the install fails" am: d6f436849d
am: 4849c87033

Change-Id: I7fd09a998e2a3d21ad9c772179890988b44809b5
2017-04-22 00:25:17 +00:00
Tianjie Xu 4849c87033 Merge "Reboot the device on user build after the install fails"
am: d6f436849d

Change-Id: I72eae6c525d6dd39c86a74b144d0970ad8793b42
2017-04-22 00:19:18 +00:00
Treehugger Robot d6f436849d Merge "Reboot the device on user build after the install fails" 2017-04-22 00:11:52 +00:00
Tianjie Xu d9d16297dd Reboot the device on user build after the install fails
Users can't do much after the install fails with the device showing
"error" under recovery. So our best choice is to reboot the device
since sometimes the system image is still bootable (i.e. on package
verification failure). At worst the device would stuck in a boot loop
where the users need the same professional knowledge to recover as
before.

Behaviors after installation failure (including data wipe):
If recovery text is visible:
No change.

If recovery text is not visible:
Old behavior: Wait under "error" screen. Reboot after UI timeout (120s)
              if not connected to usb charger.
New behavior: Wait for 5s (shortens from the 120s timeout) under "error"
              screen and reboot (w or w/o charger).

sideload-auto-reboot (only available for userdebug):
Old behavior: Reboot immediately after installation failure.
New behavior: Wait for 5s under "error" screen and reboot.

Bug: 35386985
Test: On angler user, device auto reboots 5s after a failing OTA.

Change-Id: I3ff0ead86e2ccec9445d6a2865bc2c463855f23c
2017-04-21 22:49:30 +00:00
Tao Bao 0a3e4dca58 tests: Remove obsolete classes in applypatch_test.
ApplyPatchFullTest and ApplyPatchDoubleCacheTest were used for defining
testcases for file-based OTA. The testcases have already been removed by
commit 40e144dae8. This CL removes the
obsolete class defnitions.

Bug: 37559618
Test: recovery_component_test on angler and marlin respectively.
Change-Id: I3f4f1dfc8580cf010365e671de256f68bbc0d99a
2017-04-21 09:52:27 -07:00
Tianjie Xu 7a004a8402 Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7 am: 33a8900d2b
am: fa982415a5

Change-Id: I11760a580106049067f4a923f5d7c17f2ae87b82
2017-04-20 02:31:47 +00:00
Tianjie Xu fa982415a5 Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3 am: 235a2cc1c7
am: 33a8900d2b

Change-Id: I0e83d8f196397b2eb7afaab9c531d2bebec29346
2017-04-20 01:43:21 +00:00
Tianjie Xu 33a8900d2b Merge "Minor clean up to minadbd_services.cpp" am: fa7d55a7e3
am: 235a2cc1c7

Change-Id: I71fd3d604a8adadb29f9e4f1916a1e1bdb5eebed
2017-04-20 01:41:50 +00:00
Tianjie Xu 235a2cc1c7 Merge "Minor clean up to minadbd_services.cpp"
am: fa7d55a7e3

Change-Id: I741417224e3ee22916e5b0ae6adc237887bd3ecb
2017-04-20 01:39:20 +00:00
Tianjie Xu fa7d55a7e3 Merge "Minor clean up to minadbd_services.cpp" 2017-04-20 01:34:30 +00:00
Tao Bao 286b98f551 Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc am: d7a065eb1c
am: 3a484e49bb

Change-Id: Iece1d57f4be2b9b7c71f1dbdbc30f5ec25ad8671
2017-04-20 01:03:18 +00:00
Tao Bao 3a484e49bb Merge "Call libvintf to verify package compatibility." am: b0945e1a23 am: 8e7884abcc
am: d7a065eb1c

Change-Id: I885d137e5ffc873ab8af1155b1e85eca65d8f03c
2017-04-20 00:20:45 +00:00
Tao Bao d7a065eb1c Merge "Call libvintf to verify package compatibility." am: b0945e1a23
am: 8e7884abcc

Change-Id: I229350afea463c596d7155794fca300bf9547229
2017-04-20 00:19:15 +00:00
Tao Bao 8e7884abcc Merge "Call libvintf to verify package compatibility."
am: b0945e1a23

Change-Id: I1c54dafa606aa4ba0955983f3a5023d7b65ded1b
2017-04-20 00:17:15 +00:00
Tao Bao f2784b6a43 Add more tests for verify_package_compatibility().
This now covers the actual calls to libvintf, and asserts we're getting
identical results through verify_package_compatibility() and by calling
libvintf directly.

We were missing the coverage and introduced the double free bug (fixed
by commit f978278995).

Bug: 37413730
Test: recovery_component_test passes.
Test: recovery_component_test fails w/o commit
      f978278995.
Change-Id: If5195ea1c583fd7c440a1de289da82145e80e23c
2017-04-19 17:10:34 -07:00
Tao Bao b0945e1a23 Merge "Call libvintf to verify package compatibility." 2017-04-20 00:10:09 +00:00
Tao Bao 71df092bf2 Call libvintf to verify package compatibility. am: da320ac6ab
am: 34ae4d02ce

Change-Id: I96580281c3d898b382e9870f3dbc8db218114e27
2017-04-19 22:25:53 +00:00
Tao Bao 34ae4d02ce Call libvintf to verify package compatibility.
am: da320ac6ab

Change-Id: I5749ac56a8eed8c3ce8420360643a4cfe8d52bc7
2017-04-19 22:19:06 +00:00
Tao Bao 919d2c9a53 Call libvintf to verify package compatibility.
The libvintf API has landed. Hook up to do the actual verification.

Bug: 36597505
Test: recovery_component_test
Test: m recoveryimage; adb sideload on angler and sailfish, with
      packages that contain dummy compatibility entries.
Test: m recoveryimage; adb sideload on angler and sailfish, with
      packages that don't contain any compatibility entries.
Change-Id: Idbd6f5aaef605ca51b20e667505d686de5ac781f
(cherry picked from commit da320ac6ab)
2017-04-19 15:17:16 -07:00
Tianjie Xu 6af51a0eef Minor clean up to minadbd_services.cpp
Switch some function signatures to std::string to avoid memory leak.

Bug: 30039381
Test: sideload a package on angler
Change-Id: Iae1e75871a782d6e5d6dde5dcf3f18469eb63f7d
2017-04-19 14:54:04 -07:00
Tao Bao da320ac6ab Call libvintf to verify package compatibility.
The libvintf API has landed. Hook up to do the actual verification.

Bug: 36597505
Test: recovery_component_test
Test: m recoveryimage; adb sideload on angler and sailfish, with
      packages that contain dummy compatibility entries.
Test: m recoveryimage; adb sideload on angler and sailfish, with
      packages that don't contain any compatibility entries.
Change-Id: Idbd6f5aaef605ca51b20e667505d686de5ac781f
2017-04-19 13:04:57 -07:00
Tao Bao 0ae77823f4 Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0 am: 7b9b77f445
am: 67045afa85

Change-Id: I449c52d75ee821293e57878eda5b95782912d429
2017-04-19 19:03:23 +00:00
Tao Bao 67045afa85 Merge "Add tests for read_metadata_from_package()." am: e888d45950 am: c08c055ce0
am: 7b9b77f445

Change-Id: I9e3563e052ce1b993981af29c8af9fd4ab4f3516
2017-04-19 18:58:52 +00:00
Tao Bao 7b9b77f445 Merge "Add tests for read_metadata_from_package()." am: e888d45950
am: c08c055ce0

Change-Id: I000e0cc00b510a7734e5cc41143f1d5939293b24
2017-04-19 18:57:22 +00:00
Tao Bao c08c055ce0 Merge "Add tests for read_metadata_from_package()."
am: e888d45950

Change-Id: I182da1ac7d39120d8959b96dfbd70b344c27d600
2017-04-19 18:55:22 +00:00
Tao Bao e888d45950 Merge "Add tests for read_metadata_from_package()." 2017-04-19 18:51:15 +00:00
Tianjie Xu cc3bebafa2 Merge "Add 'system' to update_verifier's gid" into oc-dev am: 464c6ba9f8
am: 2e8daf8b83

Change-Id: I935d795db67b120883a34cb9e9254cdc40083fea
2017-04-19 18:24:18 +00:00
Tianjie Xu 2e8daf8b83 Merge "Add 'system' to update_verifier's gid" into oc-dev
am: 464c6ba9f8

Change-Id: I26b77c2f8bb3d041eea402fc05bcb2d820775471
2017-04-19 18:21:49 +00:00
Tianjie Xu 464c6ba9f8 Merge "Add 'system' to update_verifier's gid" into oc-dev 2017-04-19 18:17:23 +00:00
Tao Bao 30927408b8 Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d am: 6650c0426f
am: 1918fbcd40

Change-Id: Ib0eb86629ac0f1b0092120b4de2a71c7fe2a6956
2017-04-19 18:11:49 +00:00
Tao Bao 1918fbcd40 Merge "Minor clean up to install.cpp." am: 08146728c1 am: 668e84233d
am: 6650c0426f

Change-Id: Iacabb5816f811b519bde548c620929dc7b1841dd
2017-04-19 18:09:18 +00:00
Tao Bao 6650c0426f Merge "Minor clean up to install.cpp." am: 08146728c1
am: 668e84233d

Change-Id: I961822ff4c9263cef813c98877f1c3a3e9bf6441
2017-04-19 18:07:19 +00:00