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

3463 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Crowley
8bf310b9f3 Remove libfscrypt now it's in libfs_mgr 
Now that we include libfscrypt in libfs_mgr via whole_static_libs we
should not reference it directly.

Bug: 143307095
Test: treehugger
Change-Id: I4cd138b50131ec8ce7835d9604c89c99cae53212
 2019-10-30 13:34:49 -07:00
Xin Li
b89717b9c3 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
Bug: 142003500
Change-Id: Ib50f11f8f97ebd427da22b31e484777ef3210fe6
 2019-10-30 11:50:46 -07:00
Paul Crowley
5810c9a813 Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095 am: 18b8ad91b8 am: 2615e01740 
am: f3a6282a63

Change-Id: Ibe2bb80d501c619881cc66c6b49cfcaf69a75ce2
 2019-10-28 21:23:07 -07:00
Paul Crowley
7fa3e420b5 Replace "flags" property with "options" with same format as fstab am: f612b8b5ab am: 0ae752dcc3 am: d9261cd394 
am: 9c715f4b3a

Change-Id: Iaf3fe220d6405ddcebcf7c4dc7be7f636e68ec8b
 2019-10-28 21:23:01 -07:00
Paul Crowley
f3a6282a63 Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095 am: 18b8ad91b8 
am: 2615e01740

Change-Id: I8b2664197f51ecf3379e0de0e4303c71f0e2302b
 2019-10-28 21:15:25 -07:00
Paul Crowley
9c715f4b3a Replace "flags" property with "options" with same format as fstab am: f612b8b5ab am: 0ae752dcc3 
am: d9261cd394

Change-Id: I0c25c833a30130c3a5aa3a47f260351734332dd4
 2019-10-28 21:15:20 -07:00
Paul Crowley
2615e01740 Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095 
am: 18b8ad91b8

Change-Id: Ic1e283752dd13c30ee79e6f95600e38580eec23d
 2019-10-28 21:08:20 -07:00
Paul Crowley
d9261cd394 Replace "flags" property with "options" with same format as fstab am: f612b8b5ab 
am: 0ae752dcc3

Change-Id: I6446dd9eeb08958ab0a4e5c6d222ec7bdc4d6547
 2019-10-28 21:08:16 -07:00
Paul Crowley
18b8ad91b8 Merge changes from topics "fscrypt-options", "fstab-options" 
am: c17827b095

Change-Id: I9a992f0da7b5199b40ce650c2eb20258cab2b562
 2019-10-28 19:23:05 -07:00
Paul Crowley
0ae752dcc3 Replace "flags" property with "options" with same format as fstab 
am: f612b8b5ab

Change-Id: I30c51da82bdeb27a2dae7251762bb1a5241afcb8
 2019-10-28 19:22:55 -07:00
Paul Crowley
c17827b095 Merge changes from topics "fscrypt-options", "fstab-options" 
* changes:
  Use new encryption_options fstab entry
  Replace "flags" property with "options" with same format as fstab
 2019-10-29 02:00:36 +00:00
Paul Crowley
a50f6c3c2c Use new encryption_options fstab entry 
Bug: 143307095
Test: change cuttlefish fstab
Change-Id: Ia40daafc9b573c40f29c74dc2ef513fba3fc2bf9
 2019-10-28 13:36:35 -07:00
Nikita Ioffe
63af405fc8 [automerger skipped] Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b am: 3dbe996112 am: 536830ac65 
am: 667dadb67a -s ours
am skip reason: change_id Ice20ffcba2a0994c599dbebace252138ffd827de with SHA1 5d85bf3127 is in history

Change-Id: I9fe03c2c1e58979b28f5d8a34a6659ce487fd91e
 2019-10-28 05:12:48 -07:00
Nikita Ioffe
667dadb67a Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b am: 3dbe996112 
am: 536830ac65

Change-Id: I3f9ee004ffef19b5e0f83cbb50e98a2939d2202b
 2019-10-28 05:06:28 -07:00
Nikita Ioffe
536830ac65 Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b 
am: 3dbe996112

Change-Id: I2b4f95bd3edbbfe2c6843dc06cd9ad1a156ca532
 2019-10-28 03:19:33 -07:00
Nikita Ioffe
3dbe996112 Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" 
am: f37dff724b

Change-Id: Iaa1ce493c5fc67e280e4e3d656f434ad86e74f80
 2019-10-28 03:13:59 -07:00
Nikita Ioffe
f37dff724b Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" 2019-10-28 09:55:34 +00:00
Xin Li
c4902f34c0 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours am: c21f19338e -s ours am: a69c584aaa -s ours 
am: da152fccb0 -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: Ic687ebd01c5357d1f06b4f968bb76a8377258961
 2019-10-27 00:08:45 -07:00
Xin Li
da152fccb0 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours am: c21f19338e -s ours 
am: a69c584aaa -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: If55c2cd2bdc8cd6329ba62e34e8979cdd645e5b3
 2019-10-26 23:54:41 -07:00
Xin Li
a69c584aaa [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours 
am: c21f19338e -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I520c3ad27bc01eef706f411e064584dcf6268ba3
 2019-10-26 23:48:03 -07:00
Xin Li
c21f19338e [automerger skipped] Merge "Merge Coral/Flame into AOSP master" 
am: be4ff998ac -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: If1bc31b59c868707ff2b4ee406bcad0fa9da25d3
 2019-10-26 23:39:50 -07:00
Xin Li
387257af36 [automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours am: 119618a381 -s ours am: b462c16fb6 -s ours 
am: ee393feadc -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I0ccecd93d473a00359fc100207ebcbabe040dd79
 2019-10-26 23:39:37 -07:00
Xin Li
ee393feadc [automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours am: 119618a381 -s ours 
am: b462c16fb6 -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I852ab9b92bb553cc7f2fc6c5dd556e75356020b0
 2019-10-26 23:19:41 -07:00
Xin Li
b462c16fb6 [automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours 
am: 119618a381 -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I6719833c4f030b7cf0d14dce49956ea3f8362c1a
 2019-10-26 22:54:29 -07:00
Xin Li
119618a381 [automerger skipped] Merge Coral/Flame into AOSP master 
am: 8a9454c35c -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I0e4e568d378d9412f2239f37ba2c475ad4f5f30b
 2019-10-26 22:36:06 -07:00
Xin Li
be4ff998ac Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Nikita Ioffe
e1fd48999b Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT 
A little bit more self-explanatory name that explicitly says that root
is also allowed.

Test: builds
Change-Id: Ice20ffcba2a0994c599dbebace252138ffd827de
Merged-In: Ice20ffcba2a0994c599dbebace252138ffd827de
 2019-10-26 15:51:17 +01:00
Nikita Ioffe
ce2a532c00 Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" 2019-10-26 14:30:35 +00:00
Nikita Ioffe
5d85bf3127 Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT 
A little bit more self-explanatory name that explicitly says that root
is also allowed.

Test: builds
Change-Id: Ice20ffcba2a0994c599dbebace252138ffd827de
 2019-10-25 19:52:48 +01:00
Paul Crowley
3941682cf3 Merge "Use new C++ libfscrypt interface." am: 7e43d985cf am: e96e670746 am: d1823f16c8 
am: 9572a9fcdc

Change-Id: I2bb5b868ea8bf494eab1e4725a82e7b112ad63b2
 2019-10-25 11:52:07 -07:00
Paul Crowley
9572a9fcdc Merge "Use new C++ libfscrypt interface." am: 7e43d985cf am: e96e670746 
am: d1823f16c8

Change-Id: Iaeb2a0087c307ff24b9161280fd3ab4fe5bae451
 2019-10-25 11:34:57 -07:00
Paul Crowley
d1823f16c8 Merge "Use new C++ libfscrypt interface." am: 7e43d985cf 
am: e96e670746

Change-Id: Ia3caaae26d30f5f3329ae36c1aac02e592118d0b
 2019-10-25 11:20:42 -07:00
Paul Crowley
e96e670746 Merge "Use new C++ libfscrypt interface." 
am: 7e43d985cf

Change-Id: Ie2a437086f901d4e353e71ac5db8751f518bd833
 2019-10-25 11:14:52 -07:00
Paul Crowley
7e43d985cf Merge "Use new C++ libfscrypt interface." 2019-10-25 18:05:26 +00:00
Xin Li
8a9454c35c Merge Coral/Flame into AOSP master 
Bug: 141248619
Change-Id: I487bba24e1c3cef357a408424665f0348162345d
Merged-In: I7191bd73d8621831c5802e02817f459f1da32754
 2019-10-25 10:28:41 -07:00
Paul Crowley
f612b8b5ab Replace "flags" property with "options" with same format as fstab 
Bug: 143307095
Test: Set override, check policy is as expected with sm set-virtual-disk
Change-Id: Iec31d7530b15d6d4564100816c821394e0708d53
 2019-10-24 23:24:27 -07:00
Paul Crowley
5e53ff6e8f Use new C++ libfscrypt interface. 
Bug: 143307095
Test: treehugger
Change-Id: I420ba6223bd67d6fec5382a11a72b7aa124294c9
 2019-10-24 20:49:52 -07:00
Xin Li
276489bbca Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am: e9679eaa46 am: dd369ccddf 
am: fb9bf0fb6a

Change-Id: Iddf27e0fefe787ca6d2f7c75e13a414da0befb26
 2019-10-23 18:19:47 -07:00
Xin Li
fb9bf0fb6a Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am: e9679eaa46 
am: dd369ccddf

Change-Id: I3cc3f3b41c2744764e5adc45288886af211e6a7b
 2019-10-23 18:00:04 -07:00
Xin Li
dd369ccddf Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master 
am: e9679eaa46

Change-Id: I866951f186a6cc50dc9647077e4f6f915e4bdfc4
 2019-10-23 17:40:30 -07:00
TreeHugger Robot
e9679eaa46 Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master 2019-10-24 00:26:50 +00:00
Paul Lawrence
592cf7a16d Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d am: a2c2182b65 am: 0496f970a3 
am: 042a67afa1

Change-Id: Ieef46c0846657f5279b67dd7d2f437e1ffc673e0
 2019-10-23 16:32:42 -07:00
Paul Lawrence
042a67afa1 Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d am: a2c2182b65 
am: 0496f970a3

Change-Id: I5215f7b8b82b0aa9ec598cd0d8de3848c5bef3fb
 2019-10-23 16:12:52 -07:00
Paul Lawrence
0496f970a3 Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d 
am: a2c2182b65

Change-Id: I6498dcc83ed0b30850ae9cc1e94af1510bf89836
 2019-10-23 15:47:11 -07:00
Paul Lawrence
a2c2182b65 Merge "Make sure CtsCheckpointTestCases passes" 
am: 21799c8f7d

Change-Id: I7191bd73d8621831c5802e02817f459f1da32754
 2019-10-23 15:25:08 -07:00
Treehugger Robot
21799c8f7d Merge "Make sure CtsCheckpointTestCases passes" 2019-10-23 20:13:50 +00:00
Paul Lawrence
4c757fb6cc Make sure CtsCheckpointTestCases passes 
Bug: 141639903
Bug: 141499347
Test: Cts test CtsCheckpointTestCases passes
Change-Id: Id5e9c0df969340e0b8f08436daa027614c45b380
 2019-10-23 09:40:45 -07:00
Nikita Ioffe
7a04dfe86d Merge "vold: implement resetCheckpoint" am: 4eeebff8d5 am: e182b26d64 am: 3631ac59fd 
am: 3ec81f1059

Change-Id: I00ce96ee4c6c6f729c5335a04aee08712ee4ae91
 2019-10-18 15:37:54 -07:00
Nikita Ioffe
3ec81f1059 Merge "vold: implement resetCheckpoint" am: 4eeebff8d5 am: e182b26d64 
am: 3631ac59fd

Change-Id: I0514429a69a6a7331651d05cb530029d43e9c895
 2019-10-18 15:28:02 -07:00
Nikita Ioffe
3631ac59fd Merge "vold: implement resetCheckpoint" am: 4eeebff8d5 
am: e182b26d64

Change-Id: I3000b9adae1bc43f1ccdd36d313556dd93be2a33
 2019-10-18 15:22:35 -07:00