Commit Graph

4491 Commits

Author SHA1 Message Date
Tao Bao 651be2a2af Merge "minadbd: Fix a failing test due to SIGPIPE." am: 7b1fffe095 am: f849ff34d4 am: c798cf2531
am: f70e39a90d

Change-Id: I0ccdafddf54b96e7c55bdef29d9835b254ee07c2
2017-04-25 18:36:00 +00: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 d70cfe3f85 Merge "recovery: Remove the include of adb.h." am: dff2276012 am: 2dad1a9d28 am: 36683d0fc8
am: b217714654

Change-Id: Ib87c761251e6e315389814f56154eef4c9d4a208
2017-04-25 15:59:18 +00: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 c780999d56 Add more tests for verify_package_compatibility(). am: b4c0de6c7b -s ours
am: 50db2e2fd3

Change-Id: I5ee25c85f43ae671f5776bf9c04157a31d1da457
2017-04-25 04:15:02 +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 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 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 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