Tao Bao
64768cef87
Merge "Print with newline for ui_print." am: 90deaf9ab7 am: 1313a9636d
...
am: 14be4eb8ce
2017-01-24 05:02:58 +00:00
Tao Bao
14be4eb8ce
Merge "Print with newline for ui_print." am: 90deaf9ab7
...
am: 1313a9636d
2017-01-24 05:00:27 +00:00
Tao Bao
1313a9636d
Merge "Print with newline for ui_print."
...
am: 90deaf9ab7
2017-01-24 04:58:27 +00:00
Tao Bao
90deaf9ab7
Merge "Print with newline for ui_print."
2017-01-24 04:54:52 +00:00
Alex Deymo
7c5dbd6751
Remove '_static' suffix from libext2* references.
...
Bug: 34220783
Test: make checkbuild
Change-Id: Iceea20e440a4bb6a3b254486a65a86401a2241ef
2017-01-23 15:18:29 -08:00
Chris Phoenix
e218ca21d5
Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e
...
am: 58eace4a96
2017-01-23 21:12:22 +00:00
Tianjie Xu
281fa9fd30
Merge "Restore the max width for recovery background texts" am: c1df344381 am: b037cff12e
...
am: f1a371b1b0
2017-01-23 21:12:07 +00:00
Chris Phoenix
58eace4a96
Merge "bootctrl HAL uses "default" service name" am: cf1af460d5
...
am: ee3030ad4e
2017-01-23 20:58:20 +00:00
Tianjie Xu
f1a371b1b0
Merge "Restore the max width for recovery background texts" am: c1df344381
...
am: b037cff12e
2017-01-23 20:58:06 +00:00
Chris Phoenix
ee3030ad4e
Merge "bootctrl HAL uses "default" service name"
...
am: cf1af460d5
2017-01-23 20:53:23 +00:00
Tianjie Xu
b037cff12e
Merge "Restore the max width for recovery background texts"
...
am: c1df344381
2017-01-23 20:53:06 +00:00
Chris Phoenix
cf1af460d5
Merge "bootctrl HAL uses "default" service name"
2017-01-23 20:48:32 +00:00
Tianjie Xu
c1df344381
Merge "Restore the max width for recovery background texts"
2017-01-23 20:37:12 +00:00
Tao Bao
0b1118d6b9
minui: Move callback functions to std::function.
...
Also make minor clean up to the header includes.
Test: mmma bootable/recovery system/core/healthd system/extra/slideshow
Change-Id: I3bfcf2c0e203c26a98ee08f1f8036c68356a69fd
2017-01-23 16:59:56 +00:00
Tianjie Xu
0f7031e295
Restore the max width for recovery background texts
...
Restore the max width to 900px for xxhdpi and 1200px for xxxhdpi
Bug: 34541299
Test: Checked width and images passed recovery_manual_test
Change-Id: If0fd51f93cfb3f965d4e9e69be5626eba89eb857
2017-01-22 18:46:04 -08:00
Tao Bao
f013642477
Print with newline for ui_print.
...
Currently the ui_print command between the recovery and updater doesn't
append newline. Updater has to send an extra "ui_print" command without
any argument to get the line break. This looks unnecessary. And not all
the callers (including the ones in bootable/recovery) are following this
protocol when sending the ui_print command.
This CL simplifies the protocol to always print with a newline for
ui_print command. When updating from an old recovery with the new
updater, all the ui_print'd strings would appear in one line as a side
effect. But a) it would only affect the text-mode UI, which won't be
shown to users; b) log files won't be affected.
Bug: 32305035
Test: Apply an update with the new updater on top of an old and new
recovery image respectively.
Change-Id: I305a0ffc6f180daf60919cf99d24d1495d68749b
2017-01-21 20:43:45 -08:00
Chris Phoenix
0157c78674
bootctrl HAL uses "default" service name
...
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.
Test: builds; verify HAL still works
In support of b/33844934
Change-Id: I5ce988128b0471384e1472298a0ae383df2b7c3e
Merged-In: I86c44aaaaf663e774c631a469ebf2b81619f89c4
2017-01-20 14:17:10 -08:00
Tao Bao
8157166107
Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656 am: ca261d3b48
...
am: 6a82bc228a
2017-01-20 20:24:43 +00:00
Tao Bao
6a82bc228a
Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656
...
am: ca261d3b48
2017-01-20 20:22:13 +00:00
Tao Bao
ca261d3b48
Merge "imgpatch: Compile with ZLIB_CONST defined."
...
am: e78ca37656
2017-01-20 20:19:44 +00:00
Tao Bao
4f8d217971
update_verifier: Move property_get() to android::base::GetProperty().
...
Also make minor changes to android::base::ParseUint(), which accepts
std::string now.
Test: Flash an A/B device and make sure update_verifier works (by
marking the active slot as successfully booted).
Change-Id: Id6e578671cb3c87160c2b6ca717ee618ecf2342a
2017-01-20 12:19:23 -08:00
Tao Bao
e78ca37656
Merge "imgpatch: Compile with ZLIB_CONST defined."
2017-01-20 20:15:57 +00:00
Tao Bao
087bc0c7d3
imgpatch: Compile with ZLIB_CONST defined.
...
So z_stream.next_in takes pointer to const data.
Test: mmma bootable/recovery/applypatch
Change-Id: If269b766a7c84fa2f67424ee61ba5afab0159261
2017-01-20 12:13:28 -08:00
Tianjie Xu
9af09c0505
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254
...
am: e4dcbd1c9e
2017-01-20 04:25:42 +00:00
Tianjie Xu
85bb15a4e5
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254
...
am: 87f49b83ca
2017-01-20 04:18:28 +00:00
Tianjie Xu
87f49b83ca
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc
...
am: 99e38bf254
2017-01-20 04:08:42 +00:00
Tianjie Xu
e4dcbd1c9e
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc
...
am: 99e38bf254
2017-01-20 04:08:41 +00:00
Tianjie Xu
99e38bf254
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8 am: 3d1f19c733
...
am: 8e267878cc
2017-01-20 04:05:42 +00:00
Tianjie Xu
8e267878cc
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours am: 510b13acd8
...
am: 3d1f19c733
2017-01-20 04:02:10 +00:00
Tianjie Xu
3d1f19c733
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f -s ours
...
am: 510b13acd8
2017-01-20 03:53:17 +00:00
Tianjie Xu
510b13acd8
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456
...
am: 0a627e5a5f
2017-01-20 03:38:14 +00:00
Tianjie Xu
0a627e5a5f
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c am: d1c3bdd8c2
...
am: 9930b28456
2017-01-20 03:23:12 +00:00
Tianjie Xu
9930b28456
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours am: 457ad2dc3c
...
am: d1c3bdd8c2
2017-01-20 03:08:41 +00:00
Tianjie Xu
d1c3bdd8c2
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a am: 0d750f900b -s ours
...
am: 457ad2dc3c
2017-01-20 02:55:39 +00:00
Tianjie Xu
457ad2dc3c
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours am: 8bdb13dd9a
...
am: 0d750f900b
2017-01-20 02:43:07 +00:00
Tianjie Xu
0d750f900b
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours am: 3591cb48f5 -s ours
...
am: 8bdb13dd9a
2017-01-20 02:35:07 +00:00
Tianjie Xu
8bdb13dd9a
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b -s ours
...
am: 3591cb48f5
2017-01-20 02:26:06 +00:00
Tianjie Xu
3591cb48f5
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev
...
am: 4eb997d52b
2017-01-20 02:19:36 +00:00
Tianjie Xu
4eb997d52b
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev
...
Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15
2017-01-19 16:18:31 -08:00
Sen Jiang
a727d151d4
Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004 am: 9bb0819ef6
...
am: f859652e5f
2017-01-19 20:55:43 +00:00
Sen Jiang
f859652e5f
Merge "imgdiff: cache bsdiff suffix array in zip mode." am: 37bda6a004
...
am: 9bb0819ef6
2017-01-19 20:52:43 +00:00
Sen Jiang
9bb0819ef6
Merge "imgdiff: cache bsdiff suffix array in zip mode."
...
am: 37bda6a004
2017-01-19 20:50:13 +00:00
Sen Jiang
37bda6a004
Merge "imgdiff: cache bsdiff suffix array in zip mode."
2017-01-19 20:45:27 +00:00
Tianjie Xu
98cf72d3aa
Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb
...
am: 18098b7de3
2017-01-19 19:26:06 +00:00
Tianjie Xu
18098b7de3
Merge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9
...
am: a38224eadb
2017-01-19 19:23:36 +00:00
Tianjie Xu
a38224eadb
Merge "Add checkers and tests for empty locale in PNG file"
...
am: 69e73ab7a9
2017-01-19 19:20:36 +00:00
Tianjie Xu
69e73ab7a9
Merge "Add checkers and tests for empty locale in PNG file"
2017-01-19 19:17:18 +00:00
Android Build Merger (Role)
8a6139a9e8
Merge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aosp
2017-01-19 19:07:42 +00:00
Tianjie Xu
0058ef2cec
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66
...
am: de530474e9
2017-01-19 19:07:35 +00:00
Tianjie Xu
5403bdced4
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66
...
am: 4aa56ad477
2017-01-19 19:07:35 +00:00
