Commit Graph

7296 Commits

Author SHA1 Message Date
Tao Bao a0fb95a386 Merge "recovery: Change install_package() to take std::string." am: ba365180d3
am: c0c4ae1583

Change-Id: Ifc4791197b987071609552de9a8552df385ac71d
2017-05-02 02:19:35 +00:00
Tao Bao c0c4ae1583 Merge "recovery: Change install_package() to take std::string."
am: ba365180d3

Change-Id: Ibc9d75359447d36bc5c8b827fa768b20057e56e8
2017-05-02 02:17:34 +00:00
Tao Bao ba365180d3 Merge "recovery: Change install_package() to take std::string." 2017-05-02 02:10:43 +00:00
Tao Bao 84cec1e003 Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481 am: 139a6dd9e2
am: fb26613a83

Change-Id: I01b1ffc50dfb7b7a111aa2e69abfdb01e842f8ab
2017-05-01 21:00:14 +00:00
Tao Bao fb26613a83 Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481
am: 139a6dd9e2

Change-Id: Iafe926bcdcfe28de78801493132af8fb9605de79
2017-05-01 20:56:11 +00:00
Tao Bao 139a6dd9e2 Merge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9
am: dc534a9481

Change-Id: I30a59d772bb291564357d7a9bf64667856266bef
2017-05-01 20:53:42 +00:00
Tao Bao dc534a9481 Merge "adb_install: Stop passing RecoveryUI as a parameter."
am: e58dabade9

Change-Id: Ia574203d27a258c99ffbb035143a3875ab184636
2017-05-01 20:52:11 +00:00
Tao Bao e58dabade9 Merge "adb_install: Stop passing RecoveryUI as a parameter." 2017-05-01 20:45:21 +00:00
Tao Bao 29ee69bf27 recovery: Change install_package() to take std::string.
Also change the parameter type for log_buffer from reference to pointer,
so the styles for parameters look consistent.

Test: mmma bootable/recovery
Test: sideload a package with the new recovery image
Change-Id: I8f25580ccf22977624648b3e2181cca44dd67c1b
2017-05-01 12:31:48 -07:00
Tao Bao 0150d013eb adb_install: Stop passing RecoveryUI as a parameter.
It's already a global declared in common.h which is included by
adb_install.cpp.

Remove '#include "minadbd/fuse_adb_provider.h"' that's not needed by
adb_install.cpp (minadbd takes care of that).

Test: mmma bootable/recovery
Change-Id: I6d08b7abc706b4b05de2ef46a57ced2204ad297e
2017-05-01 11:47:43 -07:00
Tao Bao f0918d66be Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c am: 4cc6889da8
am: 895e6fdf36

Change-Id: I5c17e2bdfddab5e996f4a49b76447755afa5ab31
2017-04-29 18:57:26 +00:00
Tao Bao 895e6fdf36 Merge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c
am: 4cc6889da8

Change-Id: Id405586d2ff8a94a49c9cb649483dbb7ec645fd1
2017-04-29 18:55:26 +00:00
Tao Bao 4cc6889da8 Merge "minui: Fix breakage in graphics_adf." am: 54da112277
am: d66f05b82c

Change-Id: I1b2eeab49d9ab625ba396c111df1da94ff7701c7
2017-04-29 18:52:55 +00:00
Tao Bao d66f05b82c Merge "minui: Fix breakage in graphics_adf."
am: 54da112277

Change-Id: Ia65d9494373e6583325779a6fdd27e06dd01902a
2017-04-29 18:50:56 +00:00
Tao Bao 54da112277 Merge "minui: Fix breakage in graphics_adf." 2017-04-29 18:47:53 +00:00
Alistair Strachan 4697d8b11b minui: Fix breakage in graphics_adf.
When graphics_adf was refactored in 557fa1f, a class member was introduced
that was not initialized to zero. This meant that the first time Flip()
was called, current_surface would have a junk value and cause a bad
pointer rereference, crashing recovery.

Make sure current_surface is initialized to 0 for the first Flip().

Test: Ran recovery on a device using the ADF backend.
Change-Id: I9b8fac0a4d48cac990e5e9808a071c232de1ebfb
2017-04-28 16:13:02 -07:00
Tianjie Xu 9b158bc9a3 Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3e am: 711e8b649d
am: 36e3388bdc

Change-Id: Id6fe72a2599cc4c9ceafcccd26b8ed31e3c43046
2017-04-28 18:52:38 +00:00
Tianjie Xu 36e3388bdc Merge "Fix potential OOM in update_verifier" am: 5443072c3c am: 00a309ab3e
am: 711e8b649d

Change-Id: Idf8b683ed3597063637af7f73c11c9cd3672b3f6
2017-04-28 18:31:23 +00:00
Tianjie Xu 711e8b649d Merge "Fix potential OOM in update_verifier" am: 5443072c3c
am: 00a309ab3e

Change-Id: Iac217d868ccc8a3fd90dcfb26c89d653ce066ffb
2017-04-28 18:24:52 +00:00
Tianjie Xu 00a309ab3e Merge "Fix potential OOM in update_verifier"
am: 5443072c3c

Change-Id: I8bfcd49c0a5f57149d6a87ecfb244273acff3208
2017-04-28 18:16:21 +00:00
Tianjie Xu 5443072c3c Merge "Fix potential OOM in update_verifier" 2017-04-28 18:03:24 +00:00
Dmitri Plotnikov 011c1c88a7 Adding support for quiescent reboot to recovery am: ed9db0fd73
am: 7b385fb738

Change-Id: I8f65fd53ab15a2303c07a9981f5a8b5b3190c4ec
2017-04-28 04:21:26 +00:00
Dmitri Plotnikov 7b385fb738 Adding support for quiescent reboot to recovery
am: ed9db0fd73

Change-Id: Ied907089cc7a88c4cf75dbbfa366a27cc9b01f73
2017-04-28 03:57:24 +00:00
Dmitri Plotnikov ed9db0fd73 Adding support for quiescent reboot to recovery
Bug: 37401320
Test: build and push OTA and hit adb reboot recovery,quiescent. The screen should remain off throughout the upgrade process.

(cherry picked from commit 8706a98aa6)

Change-Id: I79789a151f6faafda8ecc6198c2182cc2a91da70
2017-04-27 16:31:11 -07:00
Dmitri Plotnikov b0b26aaaee Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093 am: 533ad31cc1
am: 8a3d58655c

Change-Id: Ida6d4e2bf06a902fc85e693e61b2e87f1afd736c
2017-04-27 23:13:35 +00:00
Dmitri Plotnikov 8a3d58655c Merge "Adding support for quiescent reboot to recovery" am: 0481faef77 am: 5b27cd1093
am: 533ad31cc1

Change-Id: Ia5505643eb1206ae333371a42aa47f81fdbc8d18
2017-04-27 23:00:04 +00:00
Dmitri Plotnikov 533ad31cc1 Merge "Adding support for quiescent reboot to recovery" am: 0481faef77
am: 5b27cd1093

Change-Id: I5d7730fedba7a9b5e39bd4ee3d093036406a7bd4
2017-04-27 22:47:03 +00:00
Dmitri Plotnikov 5b27cd1093 Merge "Adding support for quiescent reboot to recovery"
am: 0481faef77

Change-Id: I79e31282bd133e0de5b0f0601c5bc3bd728ddd64
2017-04-27 22:41:33 +00:00
Treehugger Robot 0481faef77 Merge "Adding support for quiescent reboot to recovery" 2017-04-27 22:34:16 +00:00
Tao Bao 598679cbad Merge "Separate libupdate_verifier module and add testcases." am: c99bb23955 am: d8c078d2c6 am: c7410924a3
am: 322d866ec8

Change-Id: I58bf1596f7247866e0d9e76c1c7a5ddc1d58024a
2017-04-27 21:41:28 +00:00
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
Tianjie Xu 8fa8f0b16c Fix potential OOM in update_verifier
Limit the size of each read to 1024 * BLOCKSIZE. (Same as the I/O limit
of each transfer command for block based OTA).

Bug: 37729708
Test: U_V sets slot successfully on sailfish, and it takes about ~20s
(no noticeable time increase)
Change-Id: I7a6cdc744fe4c0760e09e0afed75b89c16d8eac3
2017-04-27 14:22:40 -07: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 fb42678a7c Merge "libfusesideload: Clean up the CFLAGS for the module." am: 416c55cf43 am: 74812187c0 am: 67dc335646
am: 48e6d280da

Change-Id: I5dc30739121768d02b3eb6fb7c51e9143f4fa93d
2017-04-27 18:55:21 +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 afd224bf3b Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1 am: 22b1fa7d61 am: 7ee4b7dd84
am: 41dc284309

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

Change-Id: Ic8852e654a36a90c99a505fb5b2af6182aaff30d
2017-04-26 17:29:34 +00: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