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

3225 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zim
a438b24368 Fix multi-user and multi-storage with FUSE 
Up until now, the FUSE mount logic has made two assumptions:
1. The primary external volume is an emulated volume on /data/media
2. Only the primary user is running, as user zero

These assumptions are fixed by the following changes
creating an EmulatedVolume per Android user and changing the
VolumeBase id format to append the user to the id, so
s/emulated/emulated-0/. This allows us mount separate volumes per user

Some additional refactorings to re-use/clean up code.

Test: adb shell sm set-virtual-disk and partition disk operations work
even after setting up a work profile
Bug: 135341433

Change-Id: Ifabaa12368e5a591fbcdce4ee71c83ff35fdac6b
 2019-11-11 20:24:49 +00:00
shaozhongqi
0ddfc941b8 Merge "Exfat Need to add automatic repair function when exfat fsck device" am: 7e249ebdae am: 8006c80960 
am: 42726be6a3

Change-Id: Ic8f3d783087dde9550230e36749eab49b30d9fdc
 2019-11-08 15:26:27 -08:00
shaozhongqi
42726be6a3 Merge "Exfat Need to add automatic repair function when exfat fsck device" am: 7e249ebdae 
am: 8006c80960

Change-Id: I74cdf0596642b2db70f4507eefc8acd68ad1fe26
 2019-11-08 15:22:25 -08:00
shaozhongqi
8006c80960 Merge "Exfat Need to add automatic repair function when exfat fsck device" 
am: 7e249ebdae

Change-Id: I835a8717fb25b651ce815c9912322b84e9d66041
 2019-11-08 15:18:28 -08:00
Treehugger Robot
7e249ebdae Merge "Exfat Need to add automatic repair function when exfat fsck device" 2019-11-08 22:43:45 +00:00
shaozhongqi
081cf8efdb Exfat Need to add automatic repair function when exfat fsck device 
bug:143229109

Test: Manual

Change-Id: Ibf650bdcb378dd9c07f904bdd18b36f376b45b61
Signed-off-by: shaozhongqi <shaozhongqi@xiaomi.com>
 2019-10-31 06:37:50 +00:00
Paul Crowley
7ee93a66bb Merge "Remove libfscrypt now it's in libfs_mgr" am: 43f8298bdd am: ce187e7fd6 
am: ff5ad94627

Change-Id: Ibeaec1d3fd09893706cd927ff715f5f76d516749
 2019-10-30 20:44:43 -07:00
Paul Crowley
ff5ad94627 Merge "Remove libfscrypt now it's in libfs_mgr" am: 43f8298bdd 
am: ce187e7fd6

Change-Id: I67dab6b461cf9eebc91db8d922c100b786597f1d
 2019-10-30 20:38:26 -07:00
Paul Crowley
ce187e7fd6 Merge "Remove libfscrypt now it's in libfs_mgr" 
am: 43f8298bdd

Change-Id: I0eaafaa461fa2ec6153a3e3bf49926b2efc610b7
 2019-10-30 20:31:55 -07:00
Paul Crowley
43f8298bdd Merge "Remove libfscrypt now it's in libfs_mgr" 2019-10-31 03:17:23 +00:00
Xin Li
6682f3ee33 [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: b89717b9c3 
am: ac868f7b3c -s ours
am skip reason: subject contains skip directive

Change-Id: I2376db748a97dadabd502ee27ff5318586d054a8
 2019-10-30 16:28:18 -07:00
Xin Li
ac868f7b3c DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master 
am: b89717b9c3

Change-Id: Ibaa7773225c1fa7b64bce5d23dc46afae27ffee4
 2019-10-30 15:58:18 -07:00
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