Tianjie Xu and android-build-merger
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 and android-build-merger
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 and android-build-merger
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 and android-build-merger
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
Tianjie Xu and android-build-merger
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
Tianjie Xu and android-build-merger
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
Tianjie Xu and android-build-merger
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
Tianjie Xu and android-build-merger
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
Tianjie Xu and android-build-merger
a41cc29447
DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726
...
am: 5346da0220
2017-01-19 18:36:01 +00:00
Tianjie Xu and android-build-merger
d3d5e54a45
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b
...
am: fb80b4f72d
2017-01-18 22:26:47 +00:00
Tianjie Xu and android-build-merger
fb80b4f72d
Add a checker for signature boundary in verifier am: 54ea136fde
...
am: 0a34b17c8b
2017-01-18 22:24:16 +00:00
Tianjie Xu and android-build-merger
0a34b17c8b
Add a checker for signature boundary in verifier
...
am: 54ea136fde
2017-01-18 22:22:16 +00:00
Tianjie Xu and android-build-merger
5346da0220
DO NOT MERGE: Add a checker for signature boundary in verifier
...
am: f616da1726
2017-01-18 22:22:16 +00:00
Tianjie Xu
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
Tianjie Xu
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
Matt Sarett and android-build-merger
aa02888e55
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27
...
am: 8a1d4e97ad
2016-05-19 23:14:39 +00:00
Matt Sarett and android-build-merger
8a1d4e97ad
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630
...
am: ca45737e27
2016-05-19 23:12:10 +00:00
Matt Sarett and android-build-merger
ca45737e27
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e
...
am: 1f814d7630
2016-05-19 23:08:54 +00:00
Matt Sarett and android-build-merger
1f814d7630
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f
...
am: 36acff7d7e
2016-05-19 23:06:06 +00:00
Matt Sarett and android-build-merger
36acff7d7e
resolve merge conflicts of 86a28d0 to klp-modular-dev
...
am: a5bc59620f
2016-05-19 23:03:35 +00:00
Matt Sarett
a5bc59620f
resolve merge conflicts of 86a28d0 to klp-modular-dev
...
Change-Id: Ic0b085e008155da3718dab8fd5a36be6d4059aee
2016-05-19 15:47:25 -04:00
Matt Sarett and android-build-merger
86a28d0aaf
DO NOT MERGE Use updated libpng API
...
am: 839b4e592a
2016-05-19 19:26:12 +00:00
Matt Sarett
839b4e592a
DO NOT MERGE Use updated libpng API
...
BUG:23265085
Change-Id: Ibc521fae11dad22283d8469329326ef79525b414
2016-05-17 20:28:54 +00:00
Yabin Cui and android-build-merger
cae056f219
Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29 am: 877dcba47a
...
am: f4ee1720f3
2016-02-23 06:44:46 +00:00
Yabin Cui and android-build-merger
f4ee1720f3
Fix integer overflows in recovery procedure. am: 1273956e69 am: 5978a71d29
...
am: 877dcba47a
2016-02-23 06:42:07 +00:00
Yabin Cui and android-build-merger
877dcba47a
Fix integer overflows in recovery procedure. am: 1273956e69
...
am: 5978a71d29
2016-02-23 06:35:46 +00:00
Yabin Cui and android-build-merger
5978a71d29
Fix integer overflows in recovery procedure.
...
am: 1273956e69
2016-02-23 06:33:20 +00:00
Yabin Cui
1273956e69
Fix integer overflows in recovery procedure.
...
Bug: 26960931
Change-Id: Ieae45caccfb4728fcf514f0d920976585d8e6caf
(cherry picked from commit 4f2df162c6
2016-02-22 17:42:02 -08:00
Narayan Kamath and Android Git Automerger
15da523e5f
am 3c7f655b: (-s ours) am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '3c7f655bf0382776617d3c98293e28d9967c9a96':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:57:58 +00:00
Narayan Kamath and Android Git Automerger
3c7f655bf0
am 0e804d54: am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '0e804d542a2c151d254cad0d8581d9709a394a9a':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:48:24 +00:00
Narayan Kamath and Android Git Automerger
0e804d542a
am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'd396b9dbd99924f7c8687227b22220a87c85d9c7':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:33:14 +00:00
Narayan Kamath and Android Git Automerger
d396b9dbd9
am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '710b6bb9d7d36ce16453850efc3112016a77e9ff':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-12 06:30:01 +00:00
Narayan Kamath and Android Git Automerger
710b6bb9d7
am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'ec4b58ad8a21b511bf6b136792bb924eb6e9e299':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-10 20:55:33 +00:00
Narayan Kamath and Android Git Automerger
ec4b58ad8a
am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'ec63d564a86ad5b30f75aa307b4bd271f6a96a56':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-10 18:26:12 +00:00
Narayan Kamath
ec63d564a8
Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
bug: 22953624
Change-Id: Ifcc17e39433ac91ca41da5d336fb3006dfbb65a8
2015-09-09 10:42:10 +00:00
Tao Bao
be19dce86c
udpater: Call fsync() after rename().
...
We need to ensure the renamed filename reaches the underlying storage.
Bug: 22840552
Change-Id: I824b6e9d8a9c5966035be7b42a73678d07376342
(cherry picked from commit dc3922622a
2015-08-04 11:28:12 -07:00
Paul Lawrence and Android (Google) Code Review
10cf0942a7
Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
2015-07-07 17:29:02 +00:00
Paul Lawrence
392879eec0
Revert "Change init sequence to support file level encryption"
...
This reverts commit 98c1a3de23
2015-07-07 17:05:39 +00:00
Paul Lawrence and Android (Google) Code Review
d6b2b65dc4
Merge "Change init sequence to support file level encryption" into mnc-dev
2015-07-06 19:33:28 +00:00
Paul Lawrence
98c1a3de23
Change init sequence to support file level encryption
...
File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.
Split property loaded into system and data, and load in right order.
Bug: 22233063
Change-Id: I409c12e3f4a8cef474eb48818e96760fe292cc49
2015-07-06 10:44:33 -07:00
Mohamad Ayyash and Android Git Automerger
501282a42d
am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions
...
* commit 'b4b41daa2ddbe8849dacdeeafd240e2a265cb594':
Allow mounting squashfs partitions
2015-07-02 00:47:06 +00:00
Mohamad Ayyash and Android Git Automerger
b4b41daa2d
am 0ddfa329: Allow mounting squashfs partitions
...
* commit '0ddfa329acb1e6464fe5d66b58257013abf21116':
Allow mounting squashfs partitions
2015-07-02 00:30:57 +00:00
Vincent Palatin and Android (Google) Code Review
8409b08888
Merge "Add drm support to minui" into mnc-dev
2015-07-01 23:24:55 +00:00
Stéphane Marchesin and Vincent Palatin
1a92c4458d
Add drm support to minui
...
Bug: 22231636
Change-Id: I103c8e906b7dd9862b7bb89d8642268e9a3006b4
Signed-off-by: Stéphane Marchesin <marcheu@chromium.org >
2015-07-01 15:27:48 -07:00
Mohamad Ayyash and Simon Wilson
0ddfa329ac
Allow mounting squashfs partitions
...
Change-Id: Ic023eb7d8a11e2a65172a23ff39fa902ef566183
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-07-01 10:13:16 -07:00
Tao Bao
7125f9594d
Revert "Zero blocks before BLKDISCARD"
...
This reverts commit b65f0272c8
2015-06-30 23:10:44 -07:00
Tao Bao
c3dddce205
More accurate checking for overlapped ranges.
...
A RangeSet has half-closed half-open bounds. For example, "3,5" contains
blocks 3 and 4. So "3,5" and "5,7" are actually not overlapped.
Bug: 22098085
Change-Id: I362d259f8b5d62478858ad0422b635bc5068698d
(cherry picked from commit c0f56ad766
2015-06-26 13:48:46 -07:00
caozhiyuan and Tao Bao
cb9450e113
Use f_bavail to calculate free space
...
Failures are seen on devices with
Linux 3.10. And they are mainly due to this change:
https://lwn.net/Articles/546473/
The blocks reserved in this change is not the same thing as what we
think are reserved for common usage of root user. And this part is
included in free blocks but not in available blocks.
Bug: 22118089
Change-Id: I81c9531703298019a4fc11839f28d2cc8b9df34e
(cherry picked from commit 3b4977638f
2015-06-26 11:17:02 -07:00
Elliott Hughes
c35f3ce30e
Allow sideloading without authentication.
...
Bug: http://b/22025550
Change-Id: I20f09ae442536f924f19ede0abf6a2bcc0a5cedf
(cherry picked from commit 9813f5ba57
2015-06-23 11:34:07 -07:00
