Commit graph

3931 commits

Author SHA1 Message Date
Treehugger Robot
1399d250be [automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours am: 16cbb5a2c8 -s ours
am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: Iece0b98e72676046f3d16dd9fa2cb22235a3cc25
2020-05-20 07:45:30 +00:00
Treehugger Robot
16cbb5a2c8 [automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours
am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: Id73de89d4b905212935da4286ee50789b47695e6
2020-05-20 07:26:02 +00:00
Treehugger Robot
d625abfda2 Merge "Handle virtio in private fs mapping" am: e471d11d46
Change-Id: If088b875ff4cbca66fe9c6f9224b437edc85dae8
2020-05-20 07:08:04 +00:00
Treehugger Robot
e471d11d46 Merge "Handle virtio in private fs mapping" 2020-05-20 06:32:43 +00:00
Daniel Rosenberg
f36bdddc7e Move enabling sdcardfs behind a property
This allows devices that have sdcardfs enabled in the kernel to not use
it. When external_storage.sdcardfs.enabled=0, sdcardfs will not be
mounted. This is treated as default true to not affect upgrading
devices. It does not use the old ro.sys.sdcardfs as that has been
repurposed over time and no longer can be relied on to turn off
sdcardfs. This is included within emulated_storage.mk

Bug: 155222498
Test: mount|grep "type sdcardfs" should find nothing after boot complete
      if external_storage.sdcardfs.enabled=0
Change-Id: I23d75fb1225aeabbcb1a035ad62fd042b6b3c7b5
2020-05-19 22:11:49 -07:00
Automerger Merge Worker
6e535e3eb2 Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11" into rvc-d1-dev-plus-aosp 2020-05-20 05:00:18 +00:00
TreeHugger Robot
ce76f757ad Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11
Change-Id: Idce31662195bf1a087a949fc4c4483b98d5d62c7
2020-05-20 04:59:50 +00:00
TreeHugger Robot
43f7db57f6 Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b
Change-Id: I5c285cd4cc39c93bcf71bc62ccbaafa618a61440
2020-05-20 04:59:48 +00:00
TreeHugger Robot
34d72f126b Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6
Change-Id: I11bc694a26676dd9f8b0fda7f2078a9bc6ed8719
2020-05-20 04:44:11 +00:00
TreeHugger Robot
9ec7ed5b11 Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6
Change-Id: Idfa020f7211187ddc9c530482de9a53d14ef315a
2020-05-20 04:44:06 +00:00
TreeHugger Robot
0d1fcb90d6 Merge "Handle virtio in private fs mapping" into rvc-dev 2020-05-20 04:28:31 +00:00
Alistair Delva
ea97154183 Handle virtio in private fs mapping
When the vold core decides if a device is SD or USB, it checks for MMC
or virtio, however when the filesystem type is decided, it does not
check for virtio, only MMC. This causes virtio SD cards to be formatted
with ext4 unconditionally.

This fix is independently correct, but it incidentally gets adopted
storage working on cuttlefish (and Android Emulator) because f2fs can
support fscrypt and casefolding at the same time; ext4 currently cannot.

Bug: 156286088
Change-Id: I0b41670d5f76b2506dad437917c2276f8e0aaccf
Merged-In: I0b41670d5f76b2506dad437917c2276f8e0aaccf
2020-05-20 00:45:02 +00:00
Alistair Delva
c671731075 Handle virtio in private fs mapping
When the vold core decides if a device is SD or USB, it checks for MMC
or virtio, however when the filesystem type is decided, it does not
check for virtio, only MMC. This causes virtio SD cards to be formatted
with ext4 unconditionally.

This fix is independently correct, but it incidentally gets adopted
storage working on cuttlefish (and Android Emulator) because f2fs can
support fscrypt and casefolding at the same time; ext4 currently cannot.

Bug: 156286088
Change-Id: I0b41670d5f76b2506dad437917c2276f8e0aaccf
2020-05-19 17:42:20 -07:00
Automerger Merge Worker
f2922c3057 Merge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56" into rvc-d1-dev-plus-aosp 2020-05-19 23:33:31 +00:00
Paul Crowley
6d944bcc8b Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56
Change-Id: I198643b4e0f8849f51d7c3565a4050549759b06e
2020-05-19 23:33:25 +00:00
Paul Crowley
abf77f1c1c Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: b2c448fa6d
Change-Id: I4c0150be02af8974c7ab7abb0bb7a2afa42eb9ce
2020-05-19 23:33:24 +00:00
Paul Crowley
b2c448fa6d Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a
Change-Id: I2e39a3e24ea8bf488ffb8e901fa6449175673b5c
2020-05-19 23:12:25 +00:00
Paul Crowley
4ca39e4b56 Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a
Change-Id: I75726c747937654cdaea15e299cedf0f72c7c5a5
2020-05-19 23:12:02 +00:00
Paul Crowley
09ff429e2a Merge "Record use of metadata encryption in property" into rvc-dev 2020-05-19 22:59:13 +00:00
Treehugger Robot
e4e2c8de71 [automerger skipped] Merge "Expand virtio_block check to other virtual devices" am: ff9975c04f am: edb596fc36 -s ours am: 7c39a18450 -s ours
am skip reason: Change-Id Ieae805d08fddd0124a397636f04d99194a9ef7e5 with SHA-1 ff1fc9bc41 is in history

Change-Id: I7b4335215d6579f6752563ca126e86025dd4d82c
2020-05-16 05:43:37 +00:00
Treehugger Robot
7c39a18450 [automerger skipped] Merge "Expand virtio_block check to other virtual devices" am: ff9975c04f am: edb596fc36 -s ours
am skip reason: Change-Id Ieae805d08fddd0124a397636f04d99194a9ef7e5 with SHA-1 ff1fc9bc41 is in history

Change-Id: I8e4c5e3a044f8305dd29820709e073687991e559
2020-05-16 05:27:30 +00:00
Treehugger Robot
edb596fc36 Merge "Expand virtio_block check to other virtual devices" am: ff9975c04f
Change-Id: Ic604273ddef8ac356e1e23fba050da7d68a24871
2020-05-16 05:13:11 +00:00
Treehugger Robot
ff9975c04f Merge "Expand virtio_block check to other virtual devices" 2020-05-16 04:51:28 +00:00
Alistair Delva
979b3df577 Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: 7034b8a926
Change-Id: If8eb3d3ba6b8528d85f251542a0a3d3c9f6208c8
2020-05-16 02:06:37 +00:00
Alistair Delva
67b51e8880 Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5
Change-Id: I4dd6c18980f1dd04302c36fdee5387a94008b3ce
2020-05-16 02:06:13 +00:00
Alistair Delva
7034b8a926 Expand virtio_block check to other virtual devices am: ff1fc9bc41
Change-Id: I679b9ab19d470a14e2708afd9078f2cff599b3b6
2020-05-16 01:48:06 +00:00
Alistair Delva
ac8027eed5 Expand virtio_block check to other virtual devices am: ff1fc9bc41
Change-Id: I2eda581574e0adecf1617624a66af92b540c35c4
2020-05-16 01:47:58 +00:00
Alistair Delva
d3c230b5c9 Expand virtio_block check to other virtual devices
The Android Emulator isn't the only virtual device the virtio-block
detection code is useful for, and those platforms might not set any
discriminating properties to indicate that they are virtual.

Rework the virtio-block major detection to use /proc/devices instead
of hardcoding the assumption that any virtual platform can have
virtio-block at any experimental major; the new code permits only the
exact experimental major assigned to virtio-block.

The new code runs everywhere, but it will only run once and could be
expanded later to detect dynamic or experimental majors.

Bug: 156286088
Change-Id: Ieae805d08fddd0124a397636f04d99194a9ef7e5
Merged-In: Ieae805d08fddd0124a397636f04d99194a9ef7e5
2020-05-16 00:02:21 +00:00
Alistair Delva
ff1fc9bc41 Expand virtio_block check to other virtual devices
The Android Emulator isn't the only virtual device the virtio-block
detection code is useful for, and those platforms might not set any
discriminating properties to indicate that they are virtual.

Rework the virtio-block major detection to use /proc/devices instead
of hardcoding the assumption that any virtual platform can have
virtio-block at any experimental major; the new code permits only the
exact experimental major assigned to virtio-block.

The new code runs everywhere, but it will only run once and could be
expanded later to detect dynamic or experimental majors.

Bug: 156286088
Change-Id: Ieae805d08fddd0124a397636f04d99194a9ef7e5
2020-05-15 17:00:44 -07:00
Automerger Merge Worker
989b3438c7 Merge "Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: a217c25939" into rvc-d1-dev-plus-aosp 2020-05-13 14:47:45 +00:00
TreeHugger Robot
3e7128aed4 Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: a217c25939
Change-Id: I12c4c1965afbcf5022dbba62fbb7e716e4bcb923
2020-05-13 14:47:39 +00:00
TreeHugger Robot
a78f5bb571 Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: 08b5b882d6
Change-Id: I1643a4d1a5f9c29d36de9b5514fea0b40e6c4137
2020-05-13 14:47:34 +00:00
TreeHugger Robot
a217c25939 Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a
Change-Id: I0efd4541ccb6ce75bcb887c03f516b7b6ce41acc
2020-05-13 14:27:28 +00:00
TreeHugger Robot
08b5b882d6 Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a
Change-Id: Ib19a8ab5fc09b138b2dae8b1db2003127d277f10
2020-05-13 14:27:17 +00:00
TreeHugger Robot
dbc0da396a Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev 2020-05-13 14:17:04 +00:00
Satoshi Niwa
b04d7fa4c0 Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: c0cc8d0322
Change-Id: If5e9e03c77bd08588cfbd2dd6a7b4bdebb163895
2020-05-13 14:16:57 +00:00
Satoshi Niwa
ae08e4a790 Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332
Change-Id: I000153739d24da0f5d3f467c7b45eed342a29a84
2020-05-13 14:16:48 +00:00
Satoshi Niwa
c0cc8d0322 Revert "ARC++ swap for AppFuseUtil" am: 58d4044082
Change-Id: I82771efbb0ab25327fca3ffac9f77c3e126bf989
2020-05-13 14:01:23 +00:00
Satoshi Niwa
198657d332 Revert "ARC++ swap for AppFuseUtil" am: 58d4044082
Change-Id: I46e6d976324d956b1ad173ba8ed97de760999451
2020-05-13 14:00:54 +00:00
Satoshi Niwa
58d4044082 Revert "ARC++ swap for AppFuseUtil"
This reverts commit ab7c958cc5.

Reason for revert: ARC is migrating to ARCVM on R, which doesn't use AppFuse any more.

Bug: 110379912
Test: m
Change-Id: Icc827c59530274421e4c94789d96fd3d287e591e
2020-05-12 14:43:42 +00:00
Treehugger Robot
d35c5afedc Merge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1 am: 4cf8ddeed2 am: bcbd085191
Change-Id: Ibf0fe3a3d1295c5f32edc235b0047807ea8a086a
2020-05-12 13:14:27 +00:00
Treehugger Robot
bcbd085191 Merge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1 am: 4cf8ddeed2
Change-Id: I8d91ba35477d526ff886ed32c7c1357134dfca4d
2020-05-12 13:00:16 +00:00
Treehugger Robot
4cf8ddeed2 Merge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1
Change-Id: I3545346238ddaaec8c1a947f00aaeadd12dfd63b
2020-05-12 12:46:32 +00:00
Treehugger Robot
b6e2c14ed1 Merge "Revert "ARC++ swap for AppFuseUtil"" 2020-05-12 12:30:16 +00:00
Satoshi Niwa
601e7bd4e2 Revert "ARC++ swap for AppFuseUtil"
This reverts commit dcbd4fcad2.

Reason for revert: ARC is migrating to ARCVM on R, which doesn't use AppFuse any more.

Change-Id: Ifd0bf92a79c0ff25d782bea44dd593f9502f1959
2020-05-08 04:50:34 +00:00
Ricky Wai
e96b34fe82 Mount storage Android/data and Android/obb as tmpfs in app namespace
So Android/data and Android/obb won't be accessing fuse anymore,
and apps should not see other packages as well as it's sandboxed
the tmpfs.

Bug: 155462341
Test: atest AppDataIsolationTests pass after feature flag is on
Change-Id: I5658440772e669c1235d318f708a3d336523754f
2020-05-07 16:01:33 +01:00
Treehugger Robot
045bb64f83 Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25 am: 3a149b6735 am: 93dcfef249
Change-Id: I452ba7025001f1e2e6bb741679c37a81a86e251e
2020-05-06 17:54:35 +00:00
Treehugger Robot
93dcfef249 Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25 am: 3a149b6735
Change-Id: Icb1ef75616ebc3bfe3f1e71a93ca25b42cb348ae
2020-05-06 17:39:50 +00:00
Treehugger Robot
3a149b6735 Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25
Change-Id: I1fb2dbb0de98e3e2deadce25183aa37f2bc7c4ba
2020-05-06 17:22:38 +00:00
Treehugger Robot
e8acc83d25 Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." 2020-05-06 17:02:43 +00:00