Mark Salyzyn
fdea242a91
recovery: deprecate check for ro.build.system_root_image
...
If there is a "/system" in the fstab, then can not be a
system as root image.
Test: compile
Bug: 109821005
Change-Id: I2c852dcbdcf6de437d39039937799feeef949516
2018-10-11 09:04:56 -07:00
Tom Cherry
10db3854bb
Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively" am: 1a4d234daa am: 70f3689a70
...
am: 5deab15122
2018-10-07 10:57:55 -07:00
Tom Cherry
5deab15122
Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively" am: 1a4d234daa
...
am: 70f3689a70
2018-10-07 10:50:55 -07:00
Tom Cherry
70f3689a70
Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively"
...
am: 1a4d234daa
2018-10-07 10:43:47 -07:00
Tom Cherry
1a4d234daa
Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively"
2018-10-07 17:31:34 +00:00
Tianjie Xu
b803131b1c
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev am: 7f1b33e94c am: fc311bb706 am: 31e8b44c9e am: ad81bd64c2
...
am: edb3c69377
2018-10-05 15:28:47 -07:00
Tianjie Xu
1686e4d31e
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev am: 2c28ae3933 am: d142b28c2b am: a5860449c1 am: 3c46516f9e
...
am: 26d79bd03c
2018-10-05 15:28:25 -07:00
Tianjie Xu
da58cc8699
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15 am: 274945cb5b -s ours am: 71b2447163
...
am: 70d41c5181
2018-10-05 15:27:35 -07:00
Tianjie Xu
edb3c69377
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev am: 7f1b33e94c am: fc311bb706 am: 31e8b44c9e
...
am: ad81bd64c2
2018-10-05 15:24:28 -07:00
Tianjie Xu
26d79bd03c
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev am: 2c28ae3933 am: d142b28c2b am: a5860449c1
...
am: 3c46516f9e
2018-10-05 15:24:08 -07:00
Tianjie Xu
70d41c5181
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15 am: 274945cb5b -s ours
...
am: 71b2447163
2018-10-05 15:23:45 -07:00
Tianjie Xu
ad81bd64c2
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev am: 7f1b33e94c am: fc311bb706
...
am: 31e8b44c9e
2018-10-05 15:19:10 -07:00
Tianjie Xu
05e142c753
Merge "Compare the fingerprint before reading the partition" am: 81da8b12d2 am: 1cfe8098ba
...
am: 0f635dd33f
2018-10-05 15:19:01 -07:00
Tianjie Xu
3c46516f9e
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev am: 2c28ae3933 am: d142b28c2b
...
am: a5860449c1
2018-10-05 15:18:52 -07:00
Tianjie Xu
71b2447163
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15
...
am: 274945cb5b
2018-10-05 15:18:31 -07:00
Tianjie Xu
31e8b44c9e
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev am: 7f1b33e94c
...
am: fc311bb706
2018-10-05 15:14:12 -07:00
Tianjie Xu
0f635dd33f
Merge "Compare the fingerprint before reading the partition" am: 81da8b12d2
...
am: 1cfe8098ba
2018-10-05 15:13:57 -07:00
Tianjie Xu
a5860449c1
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev am: 2c28ae3933
...
am: d142b28c2b
2018-10-05 15:13:56 -07:00
Tianjie Xu
274945cb5b
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62
...
am: 6b13f89f15
2018-10-05 15:13:37 -07:00
Tianjie Xu
fc311bb706
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev
...
am: 7f1b33e94c
2018-10-05 15:09:18 -07:00
Tianjie Xu
d142b28c2b
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev
...
am: 2c28ae3933
2018-10-05 15:08:58 -07:00
Tianjie Xu
1cfe8098ba
Merge "Compare the fingerprint before reading the partition"
...
am: 81da8b12d2
2018-10-05 15:08:54 -07:00
Tianjie Xu
6b13f89f15
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb
...
am: 35332d7c62
2018-10-05 15:08:31 -07:00
Tianjie Xu
7f1b33e94c
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev
...
* changes:
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: 2050579b79
2018-10-05 21:58:04 +00:00
Tianjie Xu
2c28ae3933
Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66" into oc-dev
...
* changes:
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103cce521e4394a53559e98f39f139103cce521e439f39f139103
2018-10-05 21:57:50 +00:00
Tianjie Xu
81da8b12d2
Merge "Compare the fingerprint before reading the partition"
2018-10-05 21:56:49 +00:00
Tom Cherry
04e4afb9cf
Use only signed/unsigned numbers with ParseInt/ParseUint respectively
...
Test: build
Change-Id: If56b33c9c420237ff441779ba1dbebffd9dae8e3
2018-10-05 14:37:13 -07:00
Tianjie Xu
9eed65e1db
Compare the fingerprint before reading the partition
...
The update_verifier now compares the fingerprint of a partition before
performing the blocks read. If the fingerprint of the current system property
mismatches the one embedded in the care_map, verification of this partition
will be skipped. This is useful for the possible system only updates in the
future.
Bug: 114778109
Test: unit tests pass
Change-Id: Iea309148a05109b5810dfb533d94260d77ab8540
2018-10-04 16:42:57 -07:00
Android Build Merger (Role)
7969be6037
[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: 2050579b79
...
Change-Id: Ie86cf384b4c16fdee4e26e23016ed2ebe99f8a64
2018-10-04 21:11:13 +00:00
Tianjie Xu
2050579b79
DO NOT MERGE: Initialize the ZipArchive to zero before parsing
...
The fields of the ZipArchive on the stack are not initialized before we
call libminzip to parse the zip file. As a result, some random memory
location is freed unintentionally when we close the ZipArchive upon
parsing failures.
Bug: 35385357
Test: recompile and run the poc with asan.
Change-Id: I7e7f8ab4816c84a158af7389e1a889f8fc65f079
2018-10-04 21:11:11 +00:00
Jayant Chowdhary
7a9664fe4e
Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency."" am: f89067ab97 am: 6ab02efb27
...
am: 5fd33d7414
2018-10-02 15:22:00 -07:00
Jayant Chowdhary
5fd33d7414
Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency."" am: f89067ab97
...
am: 6ab02efb27
2018-10-02 14:35:29 -07:00
Jayant Chowdhary
6ab02efb27
Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency.""
...
am: f89067ab97
2018-10-02 13:56:35 -07:00
Jayant Chowdhary
f89067ab97
Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency.""
2018-10-02 20:14:37 +00:00
Christopher Ferris
452c16bb7f
Merge "Move to new isolation test runner." am: d87a79a947 am: e4f6fa690c
...
am: 652dcabe5a
2018-10-01 17:06:46 -07:00
Christopher Ferris
652dcabe5a
Merge "Move to new isolation test runner." am: d87a79a947
...
am: e4f6fa690c
2018-10-01 16:51:20 -07:00
Christopher Ferris
e4f6fa690c
Merge "Move to new isolation test runner."
...
am: d87a79a947
2018-10-01 16:36:50 -07:00
Christopher Ferris
d87a79a947
Merge "Move to new isolation test runner."
2018-10-01 23:07:31 +00:00
Jayant Chowdhary
d24b054fa8
Reland: "recovery_test_component: Add libbinderthreadstate as static
...
dependency."
This reverts commit 26b86bb1dc
2018-10-01 22:55:56 +00:00
Christopher Ferris
272467d950
Move to new isolation test runner.
...
Test: Ran tests.
Change-Id: I5fa99f7b6b03c7b9247b4f340f3df982063b0e3e
2018-10-01 12:19:33 -07:00
Remi NGUYEN VAN
9dd3fa8064
Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5b am: 76eaa35201
...
am: 17762f01d1
2018-09-28 03:20:08 -07:00
Remi NGUYEN VAN
17762f01d1
Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5b
...
am: 76eaa35201
2018-09-28 03:11:54 -07:00
Remi NGUYEN VAN
76eaa35201
Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency.""
...
am: 968009cd5b
2018-09-28 02:59:01 -07:00
Remi NGUYEN VAN
968009cd5b
Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency.""
2018-09-28 09:42:53 +00:00
Remi NGUYEN VAN
26b86bb1dc
Revert "recovery_test_component: Add libbinderthreadstate as static dependency."
...
This reverts commit a71c10b464
2018-09-28 07:51:13 +00:00
Jayant Chowdhary
7ae8950935
Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88f am: 20eb921f47
...
am: 927c8048a3
2018-09-27 14:45:21 -07:00
Jayant Chowdhary
927c8048a3
Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88f
...
am: 20eb921f47
2018-09-27 14:22:11 -07:00
Jayant Chowdhary
20eb921f47
Merge "recovery_test_component: Add libbinderthreadstate as static dependency."
...
am: 2dcbebf88f
2018-09-27 14:14:37 -07:00
Jayant Chowdhary
2dcbebf88f
Merge "recovery_test_component: Add libbinderthreadstate as static dependency."
2018-09-27 21:02:35 +00:00
Tianjie Xu
991336d3fc
Merge "Enable fingerprint in care_map" am: f3d0e4783f am: 881f4225f2
...
am: 5dc4cde038
2018-09-27 11:01:50 -07:00
