tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5163 commits 1 branch 0 tags 9.7 MiB
Commit graph

5163 commits

This branch
This branch
All branches
Author SHA1 Message Date
Keith Mok
fd20244d42 [automerger skipped] Merge "Set a property if seed binding is enabled." into sc-v2-dev am: 4fb97923e5 -s ours 
am skip reason: Merged-In Ie1dad1735193ce722ec036e38f826a6b90e94526 with SHA-1 e8600253ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15747971

Change-Id: Iddb9be188821f933347782e7c8ad9cebe329c5c8
 2021-09-08 22:40:16 +00:00
Keith Mok
4fb97923e5 Merge "Set a property if seed binding is enabled." into sc-v2-dev 2021-09-08 22:25:19 +00:00
Keith Mok
143b0df2df Set a property if seed binding is enabled. 
For vehicle binding seed atest

Bug: 157501579
Test: atest vehicle-binding-seed-sh

Merged-In: Ie1dad1735193ce722ec036e38f826a6b90e94526
Change-Id: Ie1dad1735193ce722ec036e38f826a6b90e94526
 2021-09-02 17:25:35 +00:00
Keith Mok
6872a26c1a Merge "Set a property if seed binding is enabled." am: cc63a93fd6 am: d5f0a5751e am: 7586bba487 am: 2a305d48a9 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1816736

Change-Id: I4ebb0fd8e34e0d534e08bceafb9e72504553367b
 2021-09-02 00:58:04 +00:00
Keith Mok
2a305d48a9 Merge "Set a property if seed binding is enabled." am: cc63a93fd6 am: d5f0a5751e am: 7586bba487 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1816736

Change-Id: I31bf53fb43e6f6367a70cbcf51cccf8f82342a70
 2021-09-02 00:45:22 +00:00
Keith Mok
7586bba487 Merge "Set a property if seed binding is enabled." am: cc63a93fd6 am: d5f0a5751e 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1816736

Change-Id: Idfb5e71271458418b23abf8741f2b0179435dc3a
 2021-09-02 00:33:43 +00:00
Keith Mok
d5f0a5751e Merge "Set a property if seed binding is enabled." am: cc63a93fd6 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1816736

Change-Id: I80fde534da01e49298c9e7b82617befa32959414
 2021-09-02 00:18:47 +00:00
Keith Mok
cc63a93fd6 Merge "Set a property if seed binding is enabled." 2021-09-01 23:55:08 +00:00
Keith Mok
e8600253ac Set a property if seed binding is enabled. 
For vehicle binding seed atest

Bug: 157501579
Test: atest vehicle-binding-seed-sh
Change-Id: Ie1dad1735193ce722ec036e38f826a6b90e94526
 2021-09-01 22:06:10 +00:00
Haiping Yang
ff875233dd Revert "Add ROLLBACK_RESISTANCE tag to key usage" am: c0a46c8106 am: 28f635a556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15718439

Change-Id: Iaaeb2a8106c3885897ed00d7789fb99bc93c9bfb
 2021-09-01 17:46:06 +00:00
Haiping Yang
3a2b4a0295 Revert "Add ROLLBACK_RESISTANCE tag to key usage" am: c0a46c8106 am: 28f8d9e74e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15718439

Change-Id: If138cef859388a8dbc73cc35c393be4237c92318
 2021-09-01 17:45:31 +00:00
Haiping Yang
28f635a556 Revert "Add ROLLBACK_RESISTANCE tag to key usage" am: c0a46c8106 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15718439

Change-Id: I22035c8c8f548d07c6ddcc9e03333515a0dc959b
 2021-09-01 17:34:30 +00:00
Haiping Yang
28f8d9e74e Revert "Add ROLLBACK_RESISTANCE tag to key usage" am: c0a46c8106 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15718439

Change-Id: Id48e98c471efd97e378d92f63f5808528d3fb1ae
 2021-09-01 17:34:30 +00:00
Haiping Yang
c0a46c8106 Revert "Add ROLLBACK_RESISTANCE tag to key usage" 
This reverts commit 2601eb7f8c.

Ignore-AOSP-First: reverted change was introduced in sc-dev
Bug: 196887752
Test: R11 boots on master
Reason for revert: R11 boot failure on master
Change-Id: I8d2f566f3991f30cd65c48d959d26df8b6c85f32
 2021-08-30 21:04:59 +00:00
Xin Li
888961428a [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b9d97763d2 -s ours am: 8148068444 -s ours am: 7c343190da -s ours 
am skip reason: Merged-In I78039d08a9bc7d9a2d285744e6d64f4af6ac851a with SHA-1 e4190a395a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15571875

Change-Id: I0a5ca84ac7625dcca659c2d9c16aa0771e02cadc
 2021-08-17 20:32:33 +00:00
Xin Li
7c343190da [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b9d97763d2 -s ours am: 8148068444 -s ours 
am skip reason: Merged-In I78039d08a9bc7d9a2d285744e6d64f4af6ac851a with SHA-1 e4190a395a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15571875

Change-Id: If64c19baccca5aff77620422c987a70423064398
 2021-08-17 19:46:29 +00:00
Xin Li
8148068444 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b9d97763d2 -s ours 
am skip reason: Merged-In I78039d08a9bc7d9a2d285744e6d64f4af6ac851a with SHA-1 e4190a395a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15571875

Change-Id: I8578a86264433ab71215153d95274053e2def3c9
 2021-08-17 18:35:58 +00:00
Xin Li
b9d97763d2 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: I78039d08a9bc7d9a2d285744e6d64f4af6ac851a
Change-Id: I958ef629f8ca43d6539ae90e037b846d9e0b44a3
 2021-08-14 06:31:09 +00:00
Paul Crowley
b2b54ff32c Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 am: eae11551bd am: 466e30dffe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: Ia81dee4f11e9e16d96479b046d9c78f13e3bb5ff
 2021-08-13 23:25:52 +00:00
Shawn Willden
041b3d11a6 [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee am: fb0d651988 am: 426ec8ad34 -s ours 
am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15517876

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: Ib65e44b64a0ea74c29fc0f1275398030c6e86fd5
 2021-08-13 23:25:30 +00:00
Paul Crowley
b0519d0d1e [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 -s ours am: 068fbe2ea9 -s ours am: 82daf3dcad -s ours 
am skip reason: skipped by user paulcrowley

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: I3fae550d5a025f92cccf1c3761c7f57d4db62b92
 2021-08-13 21:33:58 +00:00
Paul Crowley
74547c3e55 [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 am: eae11551bd -s ours am: 23ba1a1b0d -s ours 
am skip reason: skipped by user paulcrowley

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: Ie2385b765cce35fd39b6d48f499fa444d2eb1855
 2021-08-13 21:33:41 +00:00
Shawn Willden
d3c5dcbfc3 [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee -s ours am: e4190a395a -s ours am: 22922e708e -s ours 
am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: Ia1c0995c739da147be4cf1951146d5d4a9ca097c
 2021-08-13 21:30:23 +00:00
Paul Crowley
82daf3dcad [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 -s ours am: 068fbe2ea9 -s ours 
am skip reason: skipped by user paulcrowley

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: I04b3bfa639a8838f17ddb0cc642cb78c1baf186f
 2021-08-13 21:30:12 +00:00
Paul Crowley
23ba1a1b0d [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 am: eae11551bd -s ours 
am skip reason: skipped by user paulcrowley

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: I941ac01cb256a82ab9222f2bc66484713911aa9c
 2021-08-13 21:29:58 +00:00
Shawn Willden
215eb9f302 [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee am: fb0d651988 -s ours am: 95b5da6fd4 -s ours 
am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: I4323b20355333d2edf7652b356bf25cc0d366b91
 2021-08-13 21:28:07 +00:00
Paul Crowley
068fbe2ea9 [automerger skipped] Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 -s ours 
am skip reason: skipped by user paulcrowley

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: Ib9daf1c3d27f913c99eddf09c29a45a9387fbca9
 2021-08-13 13:50:16 +00:00
Paul Crowley
466e30dffe Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 am: eae11551bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: I5a25f5527538b36dc376bc1a56170411705e7afa
 2021-08-13 03:01:43 +00:00
Paul Crowley
eae11551bd Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: I89bdf3d65c2461f882d39089e64961537888955b
 2021-08-13 02:46:44 +00:00
Paul Crowley
1566a5bf00 Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev 2021-08-13 02:33:43 +00:00
Paul Crowley
d31f36d334 Revert^2 "Detect factory reset and deleteAllKeys" 
Revert submission 15536724-revert-15521094-vold-deleteAllKeys-GDJSMLXRVZ

Reason for revert: Underlying KM problem fixed
Reverted Changes:
I8e2621bef:Revert "Detect factory reset and deleteAllKeys"
I546b980bb:Revert "Add deleteAllKeys to IKeystoreMaintenance"...
I1ed68dd9e:Revert "Allow vold to deleteAllKeys in Keystore"

Bug: 187105270
Test: booted Cuttlefish twice
Merged-In: 1e6a5f5106
Change-Id: Id641444b4ebba951aa8c5474ed60844cfaae1e20
 2021-08-13 01:44:46 +00:00
Shawn Willden
22922e708e [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee -s ours am: e4190a395a -s ours 
am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: If244cf6c5bb06335d07781d1e02e4c3d52fb319f
 2021-08-12 01:57:45 +00:00
Shawn Willden
95b5da6fd4 [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee am: fb0d651988 -s ours 
am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15517876

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: I2a63cf3373bf1e02062429dff5695b4e50083ecd
 2021-08-12 01:57:08 +00:00
Shawn Willden
426ec8ad34 Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee am: fb0d651988 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: Ib8b347507793c00f6f2c585c7cadf4bdbdb0961c
 2021-08-12 01:57:03 +00:00
Shawn Willden
fb0d651988 Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: Ie0847281b708c9eb06d54a7078fd6476e65a4099
 2021-08-12 01:33:01 +00:00
Shawn Willden
e4190a395a [automerger skipped] Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee -s ours 
am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15517876

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: I78039d08a9bc7d9a2d285744e6d64f4af6ac851a
 2021-08-12 01:31:31 +00:00
Shawn Willden
90c818d9ee Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev 2021-08-12 01:17:13 +00:00
Shawn Willden
2bab97c368 Revert "Detect factory reset and deleteAllKeys" 
Revert "Add deleteAllKeys to IKeystoreMaintenance"

Revert "Enable deleteAllKeys from vold"

Revert "Allow vold to deleteAllKeys in Keystore"

Revert submission 15521094-vold-deleteAllKeys

Reason for revert: Causes infinite loop in Trusty KeyMint
Reverted Changes:
I9c5c54714:Detect factory reset and deleteAllKeys
I2fb0e94db:Allow vold to deleteAllKeys in Keystore
Id23f25c69:Add deleteAllKeys to IKeystoreMaintenance
Ife779307d:Enable deleteAllKeys from vold
I4312b9a11:Enable deleteAllKeys from vold

Bug: 187105270
Change-Id: I8e2621bef234d0a59be422b8d1d8d52a91378a5e
 2021-08-12 01:07:00 +00:00
TreeHugger Robot
e4abb07a18 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: 7c5c6d8b43 am: 7d81779ba3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15534270

Change-Id: I053fd8861caff0aa3ad5bdd81624ee154dff2f76
 2021-08-11 23:49:37 +00:00
TreeHugger Robot
22330cef3f Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: 7c5c6d8b43 am: a2a6fc14d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15534270

Change-Id: I48429274782ccb9597b9393ff3090ab7025f8a01
 2021-08-11 23:47:42 +00:00
TreeHugger Robot
4fc0a89b5a Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: d7b96bc64f am: f7f01defb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15534270

Change-Id: I591c8c4a269688196f3b35f3f9590b5194fbdbf0
 2021-08-11 23:47:38 +00:00
TreeHugger Robot
a2a6fc14d2 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: 7c5c6d8b43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15534270

Change-Id: I6ee2548ce8f7c854adc941b141c81dc3ed4ae652
 2021-08-11 23:33:15 +00:00
TreeHugger Robot
7d81779ba3 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: 7c5c6d8b43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15534270

Change-Id: I712e82980a8f5383aa17f43066923dc29dfd8210
 2021-08-11 23:33:15 +00:00
TreeHugger Robot
f7f01defb4 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 am: d7b96bc64f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15534270

Change-Id: I5bd4e1cf55d6000fe8e0e06cc1ad7f54d9032761
 2021-08-11 23:32:53 +00:00
TreeHugger Robot
7c5c6d8b43 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15534270

Change-Id: I91b9f7520cd4b039ff43f728c6eef6357efeed65
 2021-08-11 23:18:07 +00:00
TreeHugger Robot
d7b96bc64f Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev am: 8f19fd90e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15534270

Change-Id: Ieaa3ce08c20df998a8141c77a7f771e40e1c6d0a
 2021-08-11 23:16:01 +00:00
TreeHugger Robot
8f19fd90e3 Merge "Add ROLLBACK_RESISTANCE tag to key usage" into sc-dev 2021-08-11 22:59:40 +00:00
Automerger Merge Worker
091b29d796 Merge "[automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 -s ours am: f54a94de16 -s ours" into sc-v2-dev-plus-aosp 2021-08-11 22:31:06 +00:00
Paul Crowley
1371b057d7 [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 -s ours am: f54a94de16 -s ours 
am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 0f74bd4811 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15517876

Change-Id: Ic88a0c3a362cc246aff5935cc07ac8849bb8ced1
 2021-08-11 22:30:59 +00:00
Paul Crowley
3a1ebafbc2 [automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 am: 62b8b5c7a5 -s ours 
am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15517876

Change-Id: I2ff7002e03c294dd036d524d83f7d63b7728748f
 2021-08-11 22:30:57 +00:00