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

3143 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Anderson
4d0dadb629 Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." am: ee5eb39169 
am: 5973b8cf00

Change-Id: Ieb48b5b3ca4e5576d22b7db9bcc229b8fb2f47fb
 2019-06-20 18:16:56 -07:00
David Anderson
5973b8cf00 Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." 
am: ee5eb39169

Change-Id: Ib82969daab218360712f1b3bf2c2069c95932ee2
 2019-06-20 18:06:16 -07:00
David Anderson
ee5eb39169 Merge "Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously." 2019-06-20 23:59:47 +00:00
Tri Vo
1a3b759a95 Merge "vold: use RAII wake locks" am: 798aa303da am: 56c6681ba8 
am: c3d9197784

Change-Id: I72c71a287162811acb24b9bc8be381b88b818488
 2019-06-20 16:35:52 -07:00
Tri Vo
c3d9197784 Merge "vold: use RAII wake locks" am: 798aa303da 
am: 56c6681ba8

Change-Id: I3f87e1ad31701c24fdc426c3bd562a47871e3631
 2019-06-20 15:57:53 -07:00
Tri Vo
56c6681ba8 Merge "vold: use RAII wake locks" 
am: 798aa303da

Change-Id: I157e8ceb8ece246d00ce345bd110023977a6d208
 2019-06-20 15:25:46 -07:00
Tri Vo
798aa303da Merge "vold: use RAII wake locks" 2019-06-20 19:42:50 +00:00
Tri Vo
242130f3f8 vold: use RAII wake locks 
Prevents wake lock leaks, e.g. b/133175847

Bug: 133175847
Test: boot blueline
Change-Id: I62fd1c6c3abbfd35aebe11343abd717a7cf4eef7
 2019-06-18 15:34:12 -07:00
David Anderson
1dd5c4f787 Block and wait for /dev/block/loop<N> to appear in case it was created asynchronously. 
Bug: 134711825
Test: StorageManagerTest
Change-Id: Id8616804bba622226ca21b8eff0d3eb577b4b7e0
 2019-06-18 15:27:37 -07:00
android-build-team Robot
90fe65f6ce Snap for 5663715 from 1289741942 to qt-c2f2-release 
Change-Id: Ic91ccef614f7b7afd9977139ab462328cef59332
 2019-06-15 23:04:25 +00:00
Paul Lawrence
f0eddd18ac Merge "Fail startCheckpoint if checkpoints not supported" am: 6c704f736c am: 7c35004b27 
am: 1fc2d57bbd

Change-Id: I3ab32e4f3290e52f1ad27054a957b0632567f4bd
 2019-06-14 17:33:30 -07:00
Paul Lawrence
1fc2d57bbd Merge "Fail startCheckpoint if checkpoints not supported" am: 6c704f736c 
am: 7c35004b27

Change-Id: Ie1906ef96432bed1058cc8ce6ecb6cd58adc769c
 2019-06-14 17:20:04 -07:00
Paul Lawrence
7c35004b27 Merge "Fail startCheckpoint if checkpoints not supported" 
am: 6c704f736c

Change-Id: I631c9828782452ab763d108d85082cd2120c5ee7
 2019-06-14 17:11:00 -07:00
Treehugger Robot
6c704f736c Merge "Fail startCheckpoint if checkpoints not supported" 2019-06-14 23:30:49 +00:00
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
 2019-06-13 16:07:11 -07:00
Paul Lawrence
dc76794d57 Add property to prevent commit for Vts test am: 3f1ce062d5 
am: 6eb8fa296e

Change-Id: I2027a793555fe4eceafc0ff03a05ff99d9ddf497
 2019-06-13 13:28:48 -07:00
Paul Lawrence
ff067f8f45 Add property to prevent commit for Vts test am: 3f1ce062d5 
am: 1289741942

Change-Id: Ib0420dfa4a810e4a55a7370e146df67cef735fa9
 2019-06-13 13:21:05 -07:00
Paul Lawrence
6eb8fa296e Add property to prevent commit for Vts test 
am: 3f1ce062d5

Change-Id: Ia742cb1ff865f5fd7b13843e72ee5309d90560db
 2019-06-13 13:18:10 -07:00
Paul Lawrence
1289741942 Add property to prevent commit for Vts test 
am: 3f1ce062d5

Change-Id: I96f61fbd0dda813bb55784074b7b949437cabff8
 2019-06-13 13:13:20 -07:00
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
 2019-06-12 14:24:13 -07:00
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
 2019-06-10 14:11:58 -07:00
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
 2019-06-10 13:30:11 -07:00
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
 2019-06-10 13:28:35 -07:00
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
 2019-06-10 13:21:45 -07:00
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
 2019-06-10 13:17:51 -07:00
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
 2019-06-10 13:06:15 -07:00
Xin Li
170b45c75f Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master" 2019-06-10 19:54:58 +00:00
android-build-team Robot
60ef2aa95e Snap for 5647767 from cfc8afa3c4 to qt-c2f2-release 
Change-Id: I08363db4c895bc4fba0d84ad6967dd3ed14e7d9a
 2019-06-10 19:43:03 +00:00
The Android Open Source Project
1aebde23aa DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master 
Bug: 134605042
Change-Id: Ie32488cf0d10e1a5622d24f604a7a5e84c56e79c
 2019-06-10 09:32:29 -07:00
Daniel Rosenberg
7723b785c4 Merge "Fix include order" am: 0a0b5b5f02 am: 44c18e1723 
am: b7d05eb2fb

Change-Id: Ie3ee4adf6457d0f469583ffd6bdc75872a8a77f0
 2019-06-07 19:01:04 -07:00
Daniel Rosenberg
b7d05eb2fb Merge "Fix include order" am: 0a0b5b5f02 
am: 44c18e1723

Change-Id: I80ae48916a7cb5182bb802c6919387204b860b09
 2019-06-07 18:55:10 -07:00
Daniel Rosenberg
44c18e1723 Merge "Fix include order" 
am: 0a0b5b5f02

Change-Id: I002b546d733dd55ced79aeb118c6394ce973d609
 2019-06-07 18:49:05 -07:00
Treehugger Robot
0a0b5b5f02 Merge "Fix include order" 2019-06-08 01:30:38 +00:00
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
 2019-06-07 16:11:52 -07:00
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
 2019-06-07 16:06:51 -07:00
Daniel Rosenberg
288fca9266 Merge "Defer deleteKey in KeyStorage in Checkpointing mode" 
am: fc4ad04ffe

Change-Id: Ib4f127130bdf05fe092fec15d999e5d645441303
 2019-06-07 16:00:50 -07:00
Treehugger Robot
fc4ad04ffe Merge "Defer deleteKey in KeyStorage in Checkpointing mode" 2019-06-07 22:48:00 +00:00
Xin Li
f3a3c23073 Merge "Restore historical behavior with fsck_msdos (always accept fixes)." am: a2518c7fe7 am: 8941a145a0 
am: fd11fee219

Change-Id: I4cb91299d86d9055b089064cc0a0e884f9bf9cd1
 2019-06-07 15:29:30 -07:00
Xin Li
fd11fee219 Merge "Restore historical behavior with fsck_msdos (always accept fixes)." am: a2518c7fe7 
am: 8941a145a0

Change-Id: I3ccf537b4802baf6ff43b1ff3b24f44c59e9fa08
 2019-06-07 15:23:25 -07:00
Xin Li
8941a145a0 Merge "Restore historical behavior with fsck_msdos (always accept fixes)." 
am: a2518c7fe7

Change-Id: I91202edd2dbca6e8eb4c58fa25453da22045a062
 2019-06-07 15:17:24 -07:00
Treehugger Robot
a2518c7fe7 Merge "Restore historical behavior with fsck_msdos (always accept fixes)." 2019-06-07 22:05:20 +00:00
Daniel Rosenberg
d2906b8b5f Fix include order 
Change-Id: Id839cc52801f3d0fce2d46faecf813812613e431
Test: None
 2019-06-07 14:18:40 -07:00
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
 2019-06-07 14:11:01 -07:00
Daniel Rosenberg
637d110604 Defer deleteKey in KeyStorage in Checkpointing mode am: 8cc5716ef1 
am: 923f8f04e4

Change-Id: Ibbdc128fd872b266e35237959dc8880ba66fbf88
 2019-06-07 13:13:08 -07:00
Daniel Rosenberg
87d1282e5e Defer deleteKey in KeyStorage in Checkpointing mode am: 8cc5716ef1 
am: cfc8afa3c4

Change-Id: Ia3f0ed4c31a4f02908f8212a577e97cd802ddc5a
 2019-06-07 13:11:43 -07:00
Daniel Rosenberg
cfc8afa3c4 Defer deleteKey in KeyStorage in Checkpointing mode 
am: 8cc5716ef1

Change-Id: Iecd54afeec49d27ce0c74d1ee41fa3aefe169c84
 2019-06-07 13:05:41 -07:00
Daniel Rosenberg
923f8f04e4 Defer deleteKey in KeyStorage in Checkpointing mode 
am: 8cc5716ef1

Change-Id: I38a8d0de1760f0d526cb00c441129dc025049358
 2019-06-07 13:05:41 -07:00
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
 2019-06-07 00:35:42 -07:00
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
 2019-06-07 00:29:27 -07:00
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
 2019-06-07 00:26:39 -07:00