PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,577 Commits 1 Branch 0 Tags
28ea7b000ae1d45c81663f69b3da45f3964d2ff7
Commit Graph

9577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Salyzyn 28f34187b1 Merge "recovery: deprecate check for ro.build.system_root_image" am: a67e9424c3 am: 9320e18f5d 
am: 0d9e379cd6

Change-Id: Ie7260bca94dd39ffd8fb41214767eb702b93cb22
 2018-10-11 12:30:26 -07:00
Mark Salyzyn 0d9e379cd6 Merge "recovery: deprecate check for ro.build.system_root_image" am: a67e9424c3 
am: 9320e18f5d

Change-Id: Ie4ac93e57b0dad4e52fd9172375c3a158f33ca3f
 2018-10-11 12:26:21 -07:00
Mark Salyzyn 9320e18f5d Merge "recovery: deprecate check for ro.build.system_root_image" 
am: a67e9424c3

Change-Id: If63275e0112889b25668ad29b0429b4b3c27dfb2
 2018-10-11 12:22:18 -07:00
Treehugger Robot a67e9424c3 Merge "recovery: deprecate check for ro.build.system_root_image" 2018-10-11 19:04:29 +00:00
Simon Shields 2e9747f5b2 Revert "updater: Remove dead make_parents()." 
This reverts commit 5902691764.

Change-Id: I69eadf1a091f6ecd45531789dedf72a178a055ba
 2018-10-11 18:11:26 +02:00
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

Change-Id: I6e1521a74e85a67a99e101093d2dc7eaeb16a3b0
 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

Change-Id: I81b1e5607314be9ddfc4cf9c49648bb6f7fd2374
 2018-10-07 10:50:55 -07:00
Tom Cherry 70f3689a70 Merge "Use only signed/unsigned numbers with ParseInt/ParseUint respectively" 
am: 1a4d234daa

Change-Id: I35a0d3de7dfafe382fbe203c3e7d74c1ea09ef26
 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
android-build-team Robot 8b508c984d Merge "Snap for 5053079 from ad81bd64c2 to pi-qpr2-release" into pi-qpr2-release 2018-10-06 03:22:49 +00:00
android-build-team Robot 5ccda7bcfb Snap for 5053079 from ad81bd64c2 to pi-qpr2-release 
Change-Id: I0d3a832e597b1e4c35a7208bf23142ecbdc4c7cf
 2018-10-06 03:07:53 +00:00
android-build-team Robot 7649f4c988 Snap for 5053079 from ad81bd64c2 to pi-qpr2-release 
Change-Id: Iebf5692d87e2688649237b430908ac3f5e7f4e84
 2018-10-06 03:04:47 +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

Change-Id: I6e14bd89de744560029346d18b2a2b1882f5cb95
 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

Change-Id: Ibc9b9c20f4ec1d35056bef47f98c9617bc42965a
 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  -s ours

Change-Id: I1882cd594c7708753f88ca0bad6e026ec1cc498a
 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

Change-Id: Ib688e3650ec98e7ac8732b4b98ef732dda19ff9c
 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

Change-Id: I814a8a8b52084dcbcfefa5960a827a3d43fb7f54
 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

Change-Id: I4c58e2c29d3d791f91bfd1aee91b5571d8fe9de9
 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

Change-Id: Ic5ced424323e58fe3f76651062f31ec158ae6805
 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

Change-Id: I63a8ef4992b0439f25f60fb3a700b08cd611fb08
 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

Change-Id: Ic2735740442410b5246eef6de3481b933f725416
 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  -s ours

Change-Id: Ic5569d0abf7674ca5bee1b3df01170e69b6a0c1d
 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

Change-Id: I224a6d281299afecbd3503270771d6fe3bfa4fe5
 2018-10-05 15:14:12 -07:00
Tianjie Xu 0f635dd33f Merge "Compare the fingerprint before reading the partition" am: 81da8b12d2 
am: 1cfe8098ba

Change-Id: Ic85d382111f5d2d5c80f55d71b477a2083a394d4
 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

Change-Id: If12b37fbe0ee9934b46eedc5332981b63e5774cc
 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

Change-Id: Iecb9ede3a76664e15fc2b533b20571c8052ed4ba
 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

Change-Id: I81299bf856a9738fdfc915cc929abdf05952dfd2
 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

Change-Id: I265f4af4039125793e90fc034c3dfc87eb6ad227
 2018-10-05 15:08:58 -07:00
Tianjie Xu 1cfe8098ba Merge "Compare the fingerprint before reading the partition" 
am: 81da8b12d2

Change-Id: I8a62d55b974ecfb0a3715459ed10e2c9fd6a2c75
 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

Change-Id: I54660a0731148f1ebbe74d4412d333a9f956dcb1
 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
  DO NOT MERGE: Initialize the ZipArchive to zero before parsing
 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: f39f139103 skipped: cce521e439 skipped: 4a53559e98
  [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103 skipped: cce521e439
  [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: f39f139103
  DO NOT MERGE: Initialize the ZipArchive to zero before parsing
 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

Change-Id: Iee9a4f6337c7997c958a082670d667eda96c22c9
 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

Change-Id: I0c5c1539b98441c0d5d987d88670b686b146571b
 2018-10-02 14:35:29 -07:00
Jayant Chowdhary 6ab02efb27 Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static dependency."" 
am: f89067ab97

Change-Id: I893141a2b491fb398ab1e2a6fd966401ab06cfd9
 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

Change-Id: Ia9f69775aa203cbd60af9117b97ca716c27638ee
 2018-10-01 17:06:46 -07:00
Christopher Ferris 652dcabe5a Merge "Move to new isolation test runner." am: d87a79a947 
am: e4f6fa690c

Change-Id: Ic0180f9c7d069b606c8baa47c12c68369c7be48e
 2018-10-01 16:51:20 -07:00
Christopher Ferris e4f6fa690c Merge "Move to new isolation test runner." 
am: d87a79a947

Change-Id: Icdda931c0807d43fde1a6b7fa44a6af5306efeb9
 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.

Reason for revert: Dependencies which broke tests due to exclusion from 
                   LOCAL_JNI_SHARED_LIBS have been added.

Change-Id: I364acfe8bd0526fb26f69cc29fb3545fc3e79764
 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

Change-Id: Ide250a055d00d0b9e2f3786d1f737d5c61cb3cc8
 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

Change-Id: I62bed901dde046bc807b436d4df85d31f11cd9e0
 2018-09-28 03:11:54 -07:00