Commit Graph
3922 Commits
Author SHA1 Message Date
Tao Baoandandroid-build-merger 5f8d2932d0 Merge "Remove EXPAND/STRINGIFY macros." am: b00c66faf7
am: 3642b99073

Change-Id: I28a2be565c74a051c8b5e7a5633455eb86483a3d
2017-05-03 23:46:37 +00:00
Tao Baoandandroid-build-merger 3642b99073 Merge "Remove EXPAND/STRINGIFY macros."
am: b00c66faf7

Change-Id: I59a8424b2df0a8e02999061a80b9ecefd8aa23db
2017-05-03 23:43:37 +00:00
Tao BaoandGerrit Code Review b00c66faf7 Merge "Remove EXPAND/STRINGIFY macros." 2017-05-03 23:38:32 +00:00
Tao Bao ec9706738f Remove EXPAND/STRINGIFY macros.
They are error-prone by putting anything into a string (e.g.
EXPAND(RECOVERY_API_VERSION) would become "RECOVER_API_VERSION" if we
forgot to pass -DRECOVERY_API_VERSION=3).

RECOVERY_API_VERSION is the only user (in bootable/recovery) that gets
stringified. Assign it to a typed var and sanity check the value.

Don't see other reference to the macros from device-specific recovery
directories (they can still define that locally if really needed).

Test: recovery_component_test
Test: Sideload an OTA on angler and marlin respectively.
Change-Id: I358bbdf8f0a99db5ce4c7bc2fdcafe8013501b64
2017-05-03 11:26:00 -07:00
Tianjie Xuandandroid-build-merger 7a1c2943ab Merge "Add a default error code when updater script aborts" am: 89394632b1
am: 18bb9a4f26

Change-Id: I0614c33388d68a45d443de8058c2ee36e896c583
2017-05-03 17:43:41 +00:00
Tianjie Xuandandroid-build-merger 18bb9a4f26 Merge "Add a default error code when updater script aborts"
am: 89394632b1

Change-Id: Iceebf87fb62b1c2a23e20c2b4966606c0c7b0a72
2017-05-03 17:40:41 +00:00
Tianjie XuandGerrit Code Review 89394632b1 Merge "Add a default error code when updater script aborts" 2017-05-03 17:34:45 +00:00
Tianjie Xu e0c88793d1 Add a default error code when updater script aborts
We didn't report error/cause codes unless there's an explict "Abort()"
call inside the updater script. As a result, some cause codes set by
ErrorAbort() didn't show up in last_install.

To fix the issue, add a default error code when the script terminates
abnormally (i.e. with non zero status).

Bug: 37912405
Test: error/cause code shows up in last_install when argument parsing fails
Change-Id: Ic6d3bd1855b853aeaa0760071e593a00cf6f0209
2017-05-03 05:52:03 +00:00
Tao Baoandandroid-build-merger b3eeb817ab Merge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c
am: 08d9ede8f2

Change-Id: I48024bef3d747e7f7913e5f76043ea74972ba135
2017-05-02 23:49:33 +00:00
Tao Baoandandroid-build-merger 08d9ede8f2 Merge "Move sysMapFile and sysReleaseMap into MemMapping class."
am: fe7eecff4c

Change-Id: Id67b92ed607b678aee3074329dad49d6e78c1896
2017-05-02 23:47:33 +00:00
Tao BaoandGerrit Code Review fe7eecff4c Merge "Move sysMapFile and sysReleaseMap into MemMapping class." 2017-05-02 23:42:28 +00:00
Tao Bao b656a154ea Move sysMapFile and sysReleaseMap into MemMapping class.
Test: recovery_component_test
Test: recovery_unit_test
Test: Apply an OTA on angler.
Change-Id: I7170f03e4ce1fe06184ca1d7bcce0a695f33ac4d
2017-05-01 21:51:54 -07:00
Tao Baoandandroid-build-merger 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 Baoandandroid-build-merger c0c4ae1583 Merge "recovery: Change install_package() to take std::string."
am: ba365180d3

Change-Id: Ibc9d75359447d36bc5c8b827fa768b20057e56e8
2017-05-02 02:17:34 +00:00
Tao BaoandGerrit Code Review ba365180d3 Merge "recovery: Change install_package() to take std::string." 2017-05-02 02:10:43 +00:00
Tao Baoandandroid-build-merger 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 Baoandandroid-build-merger dc534a9481 Merge "adb_install: Stop passing RecoveryUI as a parameter."
am: e58dabade9

Change-Id: Ia574203d27a258c99ffbb035143a3875ab184636
2017-05-01 20:52:11 +00:00
Tao BaoandGerrit Code Review 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 Baoandandroid-build-merger 4cc6889da8 Merge "minui: Fix breakage in graphics_adf." am: 54da112277
am: d66f05b82c

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

Change-Id: Ia65d9494373e6583325779a6fdd27e06dd01902a
2017-04-29 18:50:56 +00:00
Tao BaoandGerrit Code Review 54da112277 Merge "minui: Fix breakage in graphics_adf." 2017-04-29 18:47:53 +00:00
Alistair StrachanandTao Bao 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 Xuandandroid-build-merger 711e8b649d Merge "Fix potential OOM in update_verifier" am: 5443072c3c
am: 00a309ab3e

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

Change-Id: I8bfcd49c0a5f57149d6a87ecfb244273acff3208
2017-04-28 18:16:21 +00:00
Tianjie XuandGerrit Code Review 5443072c3c Merge "Fix potential OOM in update_verifier" 2017-04-28 18:03:24 +00:00
Dmitri Plotnikovandandroid-build-merger 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 Plotnikovandandroid-build-merger 5b27cd1093 Merge "Adding support for quiescent reboot to recovery"
am: 0481faef77

Change-Id: I79e31282bd133e0de5b0f0601c5bc3bd728ddd64
2017-04-27 22:41:33 +00:00
Treehugger RobotandGerrit Code Review 0481faef77 Merge "Adding support for quiescent reboot to recovery" 2017-04-27 22:34:16 +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 Baoandandroid-build-merger 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 Baoandandroid-build-merger d8c078d2c6 Merge "Separate libupdate_verifier module and add testcases."
am: c99bb23955

Change-Id: Idfcde607838bbcae2930fbcc9108756296f4ca34
2017-04-27 21:18:47 +00:00
Tao BaoandGerrit Code Review c99bb23955 Merge "Separate libupdate_verifier module and add testcases." 2017-04-27 21:08:54 +00:00
Tao Baoandandroid-build-merger 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 Baoandandroid-build-merger 74812187c0 Merge "libfusesideload: Clean up the CFLAGS for the module."
am: 416c55cf43

Change-Id: Ice50708eb27e01ecad729b0e05af77995b845e39
2017-04-27 18:31:19 +00:00
Tao BaoandGerrit Code Review 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 Baoandandroid-build-merger 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 Baoandandroid-build-merger 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 Baoandandroid-build-merger 22b1fa7d61 Merge "applypatch: Remove the obsolete support for "applypatch -s"."
am: d5ae4253c1

Change-Id: Ia790cb8dc24f356703dcad78bfc0f4bb7f0069e5
2017-04-26 16:56:44 +00:00
Tao Baoandandroid-build-merger 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 BaoandGerrit Code Review d5ae4253c1 Merge "applypatch: Remove the obsolete support for "applypatch -s"." 2017-04-26 16:49:48 +00:00
Tao BaoandGerrit Code Review 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 Baoandandroid-build-merger 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 Baoandandroid-build-merger f849ff34d4 Merge "minadbd: Fix a failing test due to SIGPIPE."
am: 7b1fffe095

Change-Id: I0feb7529e596a201fb0d683e5054d2b1b4227c1d
2017-04-25 18:29:29 +00:00
Tao BaoandGerrit Code Review 7b1fffe095 Merge "minadbd: Fix a failing test due to SIGPIPE." 2017-04-25 18:23:54 +00:00