Commit Graph

4446 Commits

Author SHA1 Message Date
Tao Bao 322d866ec8 Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6
am: c7410924a3

Change-Id: I452f0a1b5c0377f985294d37d59a19d1272be50d
2017-04-27 21:32:30 +00:00
Tao Bao c7410924a3 Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955
am: d8c078d2c6

Change-Id: Ic443988359d98712989c248db166fd914a2bfa8a
2017-04-27 21:20:47 +00:00
Tao Bao d8c078d2c6 Merge "Separate libupdate_verifier module and add testcases."
am: c99bb23955

Change-Id: Idfcde607838bbcae2930fbcc9108756296f4ca34
2017-04-27 21:18:47 +00:00
Tao Bao c99bb23955 Merge "Separate libupdate_verifier module and add testcases." 2017-04-27 21:08:54 +00:00
Tao Bao 48e6d280da Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 am: 74812187c0
am: 67dc335646

Change-Id: Ic15e8289fa247d3669f64cf421c5322258a09e89
2017-04-27 18:51:20 +00:00
Tao Bao 67dc335646 Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43
am: 74812187c0

Change-Id: Icca59707002ef3d0e710f9601f3fe6efa93b398e
2017-04-27 18:36:19 +00:00
Tao Bao 74812187c0 Merge "libfusesideload: Clean up the CFLAGS for the module."
am: 416c55cf43

Change-Id: Ice50708eb27e01ecad729b0e05af77995b845e39
2017-04-27 18:31:19 +00:00
Tao Bao 416c55cf43 Merge "libfusesideload: Clean up the CFLAGS for the module." 2017-04-27 18:25:52 +00:00
Tao Bao 20126e1e28 libfusesideload: Clean up the CFLAGS for the module.
Remove "-DADB_HOST=0" since it doesn't include adb related stuff.

Test: mmma bootable/recovery
Test: sideload on marlin
Change-Id: Ia83a8edd31eedd803435d687513d561c873ffabe
2017-04-27 11:04:18 -07:00
Tao Bao 83b0780ddd Separate libupdate_verifier module and add testcases.
Enable -Wall and expose verify_image() for testing purpose.

Test: mmma bootable/recovery
Test: recovery_component_test
Change-Id: I1ee1db2a775bafdc1112e25a1bc7194d8d6aee4f
2017-04-27 08:57:23 -07:00
Tao Bao 41dc284309 Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61
am: 7ee4b7dd84

Change-Id: I9f372c9b371f28b70ec6832e66053d3aee5b7c8e
2017-04-26 17:07:44 +00:00
Tao Bao ce5e980835 Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915 am: 282c863524
am: 3dcc24490b

Change-Id: I7ce76a10f42079cfa1d5f4890b9347edecd4bb24
2017-04-26 17:07:33 +00:00
Tao Bao 7ee4b7dd84 Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1
am: 22b1fa7d61

Change-Id: I16a55f996e66e46359d315508c1ea48e22f4c67f
2017-04-26 17:02:45 +00:00
Tao Bao 3dcc24490b Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." am: ac78ed8915
am: 282c863524

Change-Id: I4e9e5c6411b9ac58568bb7ea9491f533bf934bfc
2017-04-26 17:02:34 +00:00
Tao Bao 22b1fa7d61 Merge "applypatch: Remove the obsolete support for "applypatch -s"."
am: d5ae4253c1

Change-Id: Ia790cb8dc24f356703dcad78bfc0f4bb7f0069e5
2017-04-26 16:56:44 +00:00
Tao Bao 282c863524 Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow."
am: ac78ed8915

Change-Id: I7acad8d3ce6a71554e93d785e6a7e307e2c9f9fe
2017-04-26 16:56:32 +00:00
Tao Bao d5ae4253c1 Merge "applypatch: Remove the obsolete support for "applypatch -s"." 2017-04-26 16:49:48 +00:00
Tao Bao ac78ed8915 Merge "applypatch: Add determine the return value of ApplyDiffPatch and capture the error flow." 2017-04-26 16:49:08 +00:00
Tao Bao 8ab28082b7 applypatch: Remove the obsolete support for "applypatch -s".
The SpaceMode (applypatch -s) was used in amend script (cupcake) only,
which has been removed since commit
9ce2ebf5d300eba5f6086583b0941ef68a3e4b42 (platform/build). The later
(and current) edify script uses apply_patch_space().

Note that other modes (PatchMode, CheckMode) of applypatch executable
are mostly used by install-recovery.sh script.

Test: No active user of "applypatch -s".
Test: recovery_component_test
Change-Id: I1d689b7fedd3884077e88ed1d6c22f7a2198859d
2017-04-25 21:23:12 -07:00
Jinguang Dong 391bb7bb92 applypatch: Add determine the return value of ApplyDiffPatch and
capture the error flow.

Construct ota package which is bsdiff exception scene ,then do
simulation test, native code can not capture exception scenes.

Test: recovery_component_test
Test: Apply an bsdiff exception scene ota package.
Change-Id: Icd9f6eac78739bd35c74b9fcaaf8154335d680a5
2017-04-26 10:59:57 +08:00
Tao Bao f70e39a90d Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 am: f849ff34d4
am: c798cf2531

Change-Id: Ieb91c6fb06a2e8dd3602c993e261284a6d1343e0
2017-04-25 18:34:00 +00:00
Tao Bao c798cf2531 Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095
am: f849ff34d4

Change-Id: I930a2e743419a1a9323fa8a3d8deb089d569db49
2017-04-25 18:31:29 +00:00
Tao Bao f849ff34d4 Merge "minadbd: Fix a failing test due to SIGPIPE."
am: 7b1fffe095

Change-Id: I0feb7529e596a201fb0d683e5054d2b1b4227c1d
2017-04-25 18:29:29 +00:00
Tao Bao 7b1fffe095 Merge "minadbd: Fix a failing test due to SIGPIPE." 2017-04-25 18:23:54 +00:00
Tao Bao 79a0e98bb5 minadbd: Fix a failing test due to SIGPIPE.
Test: minadbd_test on bullhead.
Change-Id: Iab1c51ba8d3113a83e8b464c3640be770a6cda97
2017-04-25 09:37:20 -07:00
Tao Bao b217714654 Merge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28
am: 36683d0fc8

Change-Id: I52142d9129285cffcd9e2481799d394f5fb13a79
2017-04-25 15:57:47 +00:00
Tao Bao 36683d0fc8 Merge "recovery: Remove the include of adb.h." am: dff2276012
am: 2dad1a9d28

Change-Id: I19dc6c2adf91b695412d79cfcd8cf759afcf6cf3
2017-04-25 15:55:17 +00:00
Tao Bao 2dad1a9d28 Merge "recovery: Remove the include of adb.h."
am: dff2276012

Change-Id: If6c4e195112f8442535ae9c698277b311e590dbd
2017-04-25 15:53:17 +00:00
Tao Bao dff2276012 Merge "recovery: Remove the include of adb.h." 2017-04-25 15:42:49 +00:00
Tao Bao 50db2e2fd3 Add more tests for verify_package_compatibility().
am: b4c0de6c7b  -s ours

Change-Id: I077f67578ba0df44debf6b64323aa54dd1f69e3b
2017-04-25 04:13:02 +00:00
Tao Bao d8039acce6 recovery: Remove the include of adb.h.
recovery.cpp doesn't have a direct dependency on adb.h (only minadbd
does). 'adb.h' was once needed for DEFAULT_ADB_PORT, until being killed
by commit acb2a2fa4c.

Test: mmma bootable/recovery
Change-Id: I84f87988d01c3f0c3d1383cc3cffde2e7d5e7aea
2017-04-24 12:22:44 -07: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 b4c0de6c7b 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
(cherry picked from commit f2784b6a43)
2017-04-24 11:10:42 -07: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 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