Paul Lawrence
a7972dc732
Add property to prevent commit for Vts test
...
Old approach (do not start class main) does not work because when
testings userdebug GSI on user system, adb does not start until the
framework starts.
Bug: 134126407
Test: Test passes with userdebug GSI on user Taimen
Merged-in: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
Change-Id: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
5 years ago
Paul Lawrence
71348b891d
Add property to prevent commit for Vts test am: 3f1ce062d5
am: 6eb8fa296e
...
am: dc76794d57
Change-Id: I8ce5383c98bd7a2f2bfc9dfc1083e059caa61dd8
5 years ago
Paul Lawrence
dc76794d57
Add property to prevent commit for Vts test am: 3f1ce062d5
...
am: 6eb8fa296e
Change-Id: I2027a793555fe4eceafc0ff03a05ff99d9ddf497
5 years ago
Paul Lawrence
847ab0e7b0
Add property to prevent commit for Vts test am: 3f1ce062d5
am: 1289741942
...
am: ff067f8f45
Change-Id: I42a236d1697b22de4aa5eee55aa68308608fb029
5 years ago
Paul Lawrence
ff067f8f45
Add property to prevent commit for Vts test am: 3f1ce062d5
...
am: 1289741942
Change-Id: Ib0420dfa4a810e4a55a7370e146df67cef735fa9
5 years ago
Paul Lawrence
6eb8fa296e
Add property to prevent commit for Vts test
...
am: 3f1ce062d5
Change-Id: Ia742cb1ff865f5fd7b13843e72ee5309d90560db
5 years ago
Paul Lawrence
1289741942
Add property to prevent commit for Vts test
...
am: 3f1ce062d5
Change-Id: I96f61fbd0dda813bb55784074b7b949437cabff8
5 years ago
Paul Lawrence
3f1ce062d5
Add property to prevent commit for Vts test
...
Old approach (do not start class main) does not work because when
testings userdebug GSI on user system, adb does not start until the
framework starts.
Bug: 134126407
Test: Test passes with userdebug GSI on user Taimen
Change-Id: I20441964dbc7b6ad5b445fa17a1374c1282bbbd8
5 years ago
Janis Danisevskis
1e782f0277
Keymaster memory management is inconsistent
...
Objects derived from RefBase should always be owned by sp rather then
unique_ptr or other smart pointer implementations.
Bug: 79474587
Change-Id: I6a3ca04b3a3bab74c6114643ffdaeac537188d12
5 years ago
Xin Li
d3977baf66
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: 170b45c75f
-s ours am: b74ed73043
-s ours am: 5abd86c21e
...
am: 108097c434
-s ours
am skip reason: subject contains skip directive
Change-Id: I91a2e391d73c5aec5e5759e0101e6164148b44fc
5 years ago
Xin Li
108097c434
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: 170b45c75f
-s ours am: b74ed73043
-s ours
...
am: 5abd86c21e
Change-Id: I1fd6ee79d2b28e2132eaeece267dcebf464212db
5 years ago
The Android Open Source Project
0f4cafeb1e
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: 1aebde23aa
-s ours am: d81505cac0
-s ours am: 4a243aa78c
...
am: dfc2bb7ac1
-s ours
am skip reason: subject contains skip directive
Change-Id: I457b37b918e2ef1f871561e17634c6e5e8844d63
5 years ago
The Android Open Source Project
dfc2bb7ac1
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: 1aebde23aa
-s ours am: d81505cac0
-s ours
...
am: 4a243aa78c
Change-Id: I0ae696a0010818372484d3600712b96c654fac35
5 years ago
Xin Li
5abd86c21e
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" am: 170b45c75f
-s ours
...
am: b74ed73043
-s ours
am skip reason: subject contains skip directive
Change-Id: I5b825a62b888b1d3a654da7ebc3c5cacb56f226d
5 years ago
Xin Li
b74ed73043
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"
...
am: 170b45c75f
-s ours
am skip reason: subject contains skip directive
Change-Id: Iab16bbdc743962c766e7d556b7eeef4098f8a4ba
5 years ago
The Android Open Source Project
4a243aa78c
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: 1aebde23aa
-s ours
...
am: d81505cac0
-s ours
am skip reason: subject contains skip directive
Change-Id: I5487c6e6a413585c86d346f0c8bf434bd29b4ecd
5 years ago
The Android Open Source Project
d81505cac0
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
...
am: 1aebde23aa
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib9778c146fb82c715408db89cdaf45339f23ef05
5 years ago
Xin Li
170b45c75f
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"
5 years ago
android-build-team Robot
60ef2aa95e
Snap for 5647767 from cfc8afa3c4
to qt-c2f2-release
...
Change-Id: I08363db4c895bc4fba0d84ad6967dd3ed14e7d9a
5 years ago
The Android Open Source Project
1aebde23aa
DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master
...
Bug: 134605042
Change-Id: Ie32488cf0d10e1a5622d24f604a7a5e84c56e79c
5 years ago
Daniel Rosenberg
e17cf3fb0f
Merge "Fix include order" am: 0a0b5b5f02
am: 44c18e1723
am: b7d05eb2fb
...
am: 7723b785c4
Change-Id: Ife6106113a3ef8b3033022a58556b2ddc8285d2b
5 years ago
Daniel Rosenberg
7723b785c4
Merge "Fix include order" am: 0a0b5b5f02
am: 44c18e1723
...
am: b7d05eb2fb
Change-Id: Ie3ee4adf6457d0f469583ffd6bdc75872a8a77f0
5 years ago
Daniel Rosenberg
b7d05eb2fb
Merge "Fix include order" am: 0a0b5b5f02
...
am: 44c18e1723
Change-Id: I80ae48916a7cb5182bb802c6919387204b860b09
5 years ago
Daniel Rosenberg
44c18e1723
Merge "Fix include order"
...
am: 0a0b5b5f02
Change-Id: I002b546d733dd55ced79aeb118c6394ce973d609
5 years ago
Treehugger Robot
0a0b5b5f02
Merge "Fix include order"
5 years ago
Daniel Rosenberg
0eab873852
[automerger skipped] Merge "Defer deleteKey in KeyStorage in Checkpointing mode" am: fc4ad04ffe
am: 288fca9266
-s ours am: 5890c72489
-s ours
...
am: 911454093c
-s ours
am skip reason: change_id Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051 with SHA1 8cc5716ef1
is in history
Change-Id: I4da8f18eb43523455b860a08b689f84c535b66c9
5 years ago
Daniel Rosenberg
911454093c
[automerger skipped] Merge "Defer deleteKey in KeyStorage in Checkpointing mode" am: fc4ad04ffe
am: 288fca9266
-s ours
...
am: 5890c72489
-s ours
am skip reason: change_id Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051 with SHA1 8cc5716ef1
is in history
Change-Id: I27daa9c7758bec8234a1dc41a5242309fe2e5c08
5 years ago
Daniel Rosenberg
5890c72489
[automerger skipped] Merge "Defer deleteKey in KeyStorage in Checkpointing mode" am: fc4ad04ffe
...
am: 288fca9266
-s ours
am skip reason: change_id Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051 with SHA1 8cc5716ef1
is in history
Change-Id: I7d9f111a30c196b86f84cdaa3fd1081733be789f
5 years ago
Daniel Rosenberg
288fca9266
Merge "Defer deleteKey in KeyStorage in Checkpointing mode"
...
am: fc4ad04ffe
Change-Id: Ib4f127130bdf05fe092fec15d999e5d645441303
5 years ago
Treehugger Robot
fc4ad04ffe
Merge "Defer deleteKey in KeyStorage in Checkpointing mode"
5 years ago
Xin Li
1450855ef3
Merge "Restore historical behavior with fsck_msdos (always accept fixes)." am: a2518c7fe7
am: 8941a145a0
am: fd11fee219
...
am: f3a3c23073
Change-Id: I65d4c39f8ed23c31198cfd5187aa7fadff7f5efd
5 years ago
Xin Li
f3a3c23073
Merge "Restore historical behavior with fsck_msdos (always accept fixes)." am: a2518c7fe7
am: 8941a145a0
...
am: fd11fee219
Change-Id: I4cb91299d86d9055b089064cc0a0e884f9bf9cd1
5 years ago
Xin Li
fd11fee219
Merge "Restore historical behavior with fsck_msdos (always accept fixes)." am: a2518c7fe7
...
am: 8941a145a0
Change-Id: I3ccf537b4802baf6ff43b1ff3b24f44c59e9fa08
5 years ago
Xin Li
8941a145a0
Merge "Restore historical behavior with fsck_msdos (always accept fixes)."
...
am: a2518c7fe7
Change-Id: I91202edd2dbca6e8eb4c58fa25453da22045a062
5 years ago
Treehugger Robot
a2518c7fe7
Merge "Restore historical behavior with fsck_msdos (always accept fixes)."
5 years ago
Daniel Rosenberg
d2906b8b5f
Fix include order
...
Change-Id: Id839cc52801f3d0fce2d46faecf813812613e431
Test: None
5 years ago
Daniel Rosenberg
a48730a0fd
Defer deleteKey in KeyStorage in Checkpointing mode
...
Don't delete keys in checkpointing mode. Instead wait until the
checkpoint has been committed.
Bug: 134631661
Test: Flash A with a working build. Flash B with a broken build. Test
that the device rolls back to A without getting sent to recovery.
Merged-In: Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051
Change-Id: Ie5fc2d098355e2d095c53e9a95a6a8c7ab7ed051
5 years ago
Daniel Rosenberg
5a31d12e47
Defer deleteKey in KeyStorage in Checkpointing mode am: 8cc5716ef1
am: 923f8f04e4
...
am: 637d110604
Change-Id: I92ebf5f7e3cb9dad8c30c362d5990a7d409f26fe
5 years ago
Daniel Rosenberg
37b5eba552
Defer deleteKey in KeyStorage in Checkpointing mode am: 8cc5716ef1
am: cfc8afa3c4
...
am: 87d1282e5e
Change-Id: I9f37a64bfc5205197f4b52e6ee28d98f74c9a398
5 years ago
Daniel Rosenberg
637d110604
Defer deleteKey in KeyStorage in Checkpointing mode am: 8cc5716ef1
...
am: 923f8f04e4
Change-Id: Ibbdc128fd872b266e35237959dc8880ba66fbf88
5 years ago
Daniel Rosenberg
87d1282e5e
Defer deleteKey in KeyStorage in Checkpointing mode am: 8cc5716ef1
...
am: cfc8afa3c4
Change-Id: Ia3f0ed4c31a4f02908f8212a577e97cd802ddc5a
5 years ago
Daniel Rosenberg
cfc8afa3c4
Defer deleteKey in KeyStorage in Checkpointing mode
...
am: 8cc5716ef1
Change-Id: Iecd54afeec49d27ce0c74d1ee41fa3aefe169c84
5 years ago
Daniel Rosenberg
923f8f04e4
Defer deleteKey in KeyStorage in Checkpointing mode
...
am: 8cc5716ef1
Change-Id: I38a8d0de1760f0d526cb00c441129dc025049358
5 years ago
Xin Li
575698981d
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master am: b02c30cbf3
-s ours am: 46ac19c936
...
am: 23075d4986
-s ours
am skip reason: subject contains skip directive
Change-Id: Id778ca84c666a0633565a7c57bbd4f5592f9c175
5 years ago
Xin Li
23075d4986
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master am: b02c30cbf3
-s ours
...
am: 46ac19c936
Change-Id: Ib29f405e28836c18782939629017ef775136334a
5 years ago
Xin Li
27631918d5
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 3a6c897d05
-s ours am: 0951d225f3
...
am: b9269e6395
-s ours
am skip reason: subject contains skip directive
Change-Id: Id4245cf18cc2b2b750e3735357a63d35ed5a18b5
5 years ago
Xin Li
46ac19c936
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
...
am: b02c30cbf3
-s ours
am skip reason: subject contains skip directive
Change-Id: I456b2e5bf172a79d1c6aaf535de73b96897f5a4a
5 years ago
Xin Li
b9269e6395
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master am: 3a6c897d05
-s ours
...
am: 0951d225f3
Change-Id: Ie8a0e65cf1f8d66b7ae33254f841ce39ab6c2e98
5 years ago
Xin Li
0951d225f3
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master
...
am: 3a6c897d05
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie610a4b4078750bd62db70c8998643689dc6e25c
5 years ago
TreeHugger Robot
b02c30cbf3
Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190605.003) into stage-aosp-master" into stage-aosp-master
5 years ago