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
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
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
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
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
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
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
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
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
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
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
3591cb48f5
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev
...
am: 4eb997d52b
2017-01-20 02:19:36 +00:00
4eb997d52b
DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev
...
Change-Id: Ie52a9abae416bbb84ddc61bb7159a531de778c15
2017-01-19 16:18:31 -08:00
4aa56ad477
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
2017-01-19 19:05:05 +00:00
d0bfa33c66
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
2017-01-19 19:02:35 +00:00
8953f919e4
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
2017-01-19 19:00:11 +00:00
8f9e3c9bd9
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
2017-01-19 18:57:35 +00:00
67b69c05c6
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
2017-01-19 18:55:04 +00:00
8a51334062
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
2017-01-19 18:52:33 +00:00
b21b92b386
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
2017-01-19 18:50:33 +00:00
ddca75fb0a
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
2017-01-19 18:48:03 +00:00
37a5941440
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
2017-01-19 18:45:32 +00:00
2b1bcab427
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
2017-01-19 18:43:02 +00:00
94c8b5e5a6
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours
...
am: 051dfa7ec3
2017-01-19 18:41:01 +00:00
051dfa7ec3
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours
...
am: a41cc29447
2017-01-19 18:39:02 +00:00
a41cc29447
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726
...
am: 5346da0220
2017-01-19 18:36:01 +00:00
f127896675
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045
...
am: e0d3b0ceab
2017-01-18 22:42:18 +00:00
e0d3b0ceab
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13
...
am: e4ec60e045
2017-01-18 22:40:19 +00:00
e4ec60e045
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a
...
am: 64f0de7a13
2017-01-18 22:37:48 +00:00
64f0de7a13
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763
...
am: ca50d7b66a
2017-01-18 22:36:48 +00:00
ca50d7b66a
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3
...
am: 15ca2a4763
2017-01-18 22:34:18 +00:00
15ca2a4763
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51
...
am: a055eb93c3
2017-01-18 22:32:47 +00:00
a055eb93c3
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45
...
am: 6ea9888d51
2017-01-18 22:30:47 +00:00
6ea9888d51
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d
...
am: d3d5e54a45
2017-01-18 22:28:46 +00:00
d3d5e54a45
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b
...
am: fb80b4f72d
2017-01-18 22:26:47 +00:00
fb80b4f72d
Add a checker for signature boundary in verifier am: 54ea136fde
...
am: 0a34b17c8b
2017-01-18 22:24:16 +00:00
0a34b17c8b
Add a checker for signature boundary in verifier
...
am: 54ea136fde
2017-01-18 22:22:16 +00:00
5346da0220
DO NOT MERGE: Add a checker for signature boundary in verifier
...
am: f616da1726
2017-01-18 22:22:16 +00:00
f616da1726
DO NOT MERGE: Add a checker for signature boundary in verifier
...
The 'signature_start' variable marks the location of the signature
from the end of a zip archive. And a boundary check is missing where
'signature_start' should be within the EOCD comment field. This causes
problems when sideloading a malicious package. Also add a corresponding
test.
Bug: 31914369
Test: Verification fails correctly when sideloading recovery_test.zip on
angler.
Change-Id: I6ea96bf04dac5d8d4d6719e678d504f957b4d5c1
(cherry-picked from f69e6a947554ea136fde
2016-12-19 16:46:44 -08:00
54ea136fde
Add a checker for signature boundary in verifier
...
The 'signature_start' variable marks the location of the signature
from the end of a zip archive. And a boundary check is missing where
'signature_start' should be within the EOCD comment field. This causes
problems when sideloading a malicious package. Also add a corresponding
test.
Bug: 31914369
Test: Verification fails correctly when sideloading recovery_test.zip on
angler.
Change-Id: I6ea96bf04dac5d8d4d6719e678d504f957b4d5c1
(cherry-picked from f69e6a9475
2016-12-16 16:24:09 -08:00
14bdbb6c77
Remove outdated reference to icon_installing.png
...
am: 48be23c8ed
2016-12-15 20:39:36 +00:00
48be23c8ed
Remove outdated reference to icon_installing.png
...
The Wear recovery UI doesn't draw the installing icon but it was still
trying to open it. Ever since these images were removed eight months
ago, this has resulted in an error printing to the screen at runtime.
Since the image wasn't really used, the lines to open it can simply be
removed.
Bug: 33203397
Change-Id: Id820f6d75e316c51d19b6095df407ecd61c0410e
2016-11-29 13:50:56 -08:00
1bf1772625
DO NOT MERGE updater: Add "write_value()" function.
...
write_value(value, filename) writes 'value' to 'filename'. It can be
used to tune device settings when applying an OTA package. For example,
write_value("960000", "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq").
Bug: 32463933
Test: recovery_component_test passes.
Test: Apply an OTA package that contains a call to write_value(), and
check the result.
Change-Id: Ib009ecb8a45a94353f10c59e2383fe1f49796e35
(cherry picked from commit d0f3088aa9
2016-11-17 21:30:32 -08:00
9ab6af5a61
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours
...
am: 67bc0b9573
2016-10-27 16:25:56 +00:00
67bc0b9573
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours
...
am: 3fdf1fd515
2016-10-27 16:21:56 +00:00
3fdf1fd515
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours
...
am: 8837b0d25d
2016-10-27 16:16:55 +00:00
8837b0d25d
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours
...
am: b8c1788e7b
2016-10-27 16:11:55 +00:00
b8c1788e7b
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours
...
am: 7ceb371048
2016-10-27 16:07:25 +00:00
7ceb371048
DO NOT MERGE ANYWHERE init: move healthd to late-init
...
am: 195ff7f79e
2016-10-27 16:02:24 +00:00
195ff7f79e
DO NOT MERGE ANYWHERE init: move healthd to late-init
...
Starting healthd in early-init can cause SELinux denials if healthd
or any device-specific libraries try to log.
Now healthd is starting at boot as usual service.
Bug: 30292927
Change-Id: I367d022f5885122da49181db3db536012e83f564
2016-10-25 19:49:57 +00:00
Tianjie Xu
Tim Kryger
Tao Bao
Andriy Naborskyy