OSDN Git Service

android-x86/system-vold.git
4 years agoMerge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am:...
Martijn Coenen [Fri, 29 May 2020 16:25:52 +0000 (16:25 +0000)]
Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: 8714d59e29 am: 59339e5c62

Change-Id: Iebd8d5cb5fdc55e6f82bd3d2525fd9cef8f62f49

4 years agoMerge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am:...
Martijn Coenen [Fri, 29 May 2020 16:15:08 +0000 (16:15 +0000)]
Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: 8714d59e29

Change-Id: I91c1b387d8cf5967fa3ad412ca7453364668d812

4 years agoMerge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a
Martijn Coenen [Fri, 29 May 2020 15:59:55 +0000 (15:59 +0000)]
Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a

Change-Id: I587b49c9baed58fb87d27e060faf5d3d4ef8d788

4 years agoMerge "vold: Support aborting FUSE connections." into rvc-dev
Martijn Coenen [Fri, 29 May 2020 15:47:05 +0000 (15:47 +0000)]
Merge "vold: Support aborting FUSE connections." into rvc-dev

4 years agoFuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: e2e2b5499b...
Abhijeet Kaur [Fri, 29 May 2020 15:35:15 +0000 (15:35 +0000)]
FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: e2e2b5499b am: 74324b51de

Change-Id: I2f8377c8713bcae8c2b7e91b92c1ffe53ba5e74d

4 years agoFuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c...
Abhijeet Kaur [Fri, 29 May 2020 15:33:49 +0000 (15:33 +0000)]
FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c am: dfedc945ab

Change-Id: I6aa695accdeee88e4111d7f181bec71e749c94d1

4 years agoFuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c...
Abhijeet Kaur [Fri, 29 May 2020 15:33:29 +0000 (15:33 +0000)]
FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c am: 836430b5e0

Change-Id: I60691c32d8a7db33ab8d15d405b57eb1a7b9470d

4 years agoFuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: e2e2b5499b
Abhijeet Kaur [Fri, 29 May 2020 15:19:08 +0000 (15:19 +0000)]
FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: e2e2b5499b

Change-Id: I66bcb898dd960ced948d9137594539e8545c50c4

4 years agoFuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c
Abhijeet Kaur [Fri, 29 May 2020 15:19:00 +0000 (15:19 +0000)]
FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c

Change-Id: Ia7f5210da38ca4340f36957af894baf79a4dc41d

4 years agoFuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c
Abhijeet Kaur [Fri, 29 May 2020 15:18:56 +0000 (15:18 +0000)]
FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c

Change-Id: I1419edbe7c7004cee2cdb14bb5861d07e39d7b2f

4 years agoFuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41
Abhijeet Kaur [Fri, 29 May 2020 15:07:04 +0000 (15:07 +0000)]
FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41

Change-Id: I1e26192d3ae181bc3fd9bcb3f7bf56db0f073328

4 years agoFuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41
Abhijeet Kaur [Fri, 29 May 2020 15:06:57 +0000 (15:06 +0000)]
FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41

Change-Id: Iebe048b3e1dd31a63ed62df8c2010e9e5d5d5e4a

4 years agoFuseDaemonHostTest is migrated to CTS and renamed.
Abhijeet Kaur [Thu, 28 May 2020 17:12:40 +0000 (18:12 +0100)]
FuseDaemonHostTest is migrated to CTS and renamed.

FuseDaemonHostTest is migrated to CTS and renamed to
CtsScopedStorageHostTest.

Bug: 142926859
Test: atest --test-mapping
Change-Id: I24c74e20909ccf8868d1487e1cc93f6f2c0108fc

4 years agovold: Support aborting FUSE connections.
Martijn Coenen [Wed, 29 Apr 2020 05:49:41 +0000 (07:49 +0200)]
vold: Support aborting FUSE connections.

This can be done through binder as well as vdc, using 'vdc volume
abort_fuse'.

Bug: 153411204
Test: adb shell vdc volume abort_fuse
Change-Id: I93e46dc1cd361729cc1162c63520cf73152ea409

4 years agoMove enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62 am: 82b2e7f6a0
Daniel Rosenberg [Thu, 21 May 2020 09:17:41 +0000 (09:17 +0000)]
Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62 am: 82b2e7f6a0

Change-Id: I6630247dcf0b9077b0136d5e6022d58db170ed86

4 years agoMove enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62 am: 49d964c1c9
Daniel Rosenberg [Thu, 21 May 2020 09:03:03 +0000 (09:03 +0000)]
Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62 am: 49d964c1c9

Change-Id: Ic6bf52b4981efcafe9bdc8c1a907e0f6e793dd68

4 years agoMove enabling sdcardfs behind a property am: f36bdddc7e am: 4835e936fc am: c8ee3a8cd6
Daniel Rosenberg [Thu, 21 May 2020 09:02:05 +0000 (09:02 +0000)]
Move enabling sdcardfs behind a property am: f36bdddc7e am: 4835e936fc am: c8ee3a8cd6

Change-Id: Ie46376f6c0cdb42f8c68fb8877aeb52156e9175a

4 years agoMove enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62
Daniel Rosenberg [Thu, 21 May 2020 09:01:53 +0000 (09:01 +0000)]
Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62

Change-Id: Iaf328bd2731b680a0da9d66555c0ed7ea5b01b7a

4 years agoMove enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62
Daniel Rosenberg [Thu, 21 May 2020 09:01:49 +0000 (09:01 +0000)]
Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62

Change-Id: I6d11fa265c51423fa798c77652a6470ac0bdf88b

4 years agoMove enabling sdcardfs behind a property am: f36bdddc7e am: 4835e936fc
Daniel Rosenberg [Thu, 21 May 2020 08:46:56 +0000 (08:46 +0000)]
Move enabling sdcardfs behind a property am: f36bdddc7e am: 4835e936fc

Change-Id: I7e37b4ffa8f629f809a25352a7a6c1ef4f789748

4 years agoMove enabling sdcardfs behind a property am: f36bdddc7e
Daniel Rosenberg [Thu, 21 May 2020 08:41:18 +0000 (08:41 +0000)]
Move enabling sdcardfs behind a property am: f36bdddc7e

Change-Id: I6ded03167243e9fc60dc2206b5781a84a0140aa3

4 years agoMove enabling sdcardfs behind a property am: f36bdddc7e
Daniel Rosenberg [Thu, 21 May 2020 08:41:14 +0000 (08:41 +0000)]
Move enabling sdcardfs behind a property am: f36bdddc7e

Change-Id: I8bf90ef649975d182787757d73f9e2b46389483f

4 years ago[automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am...
Treehugger Robot [Wed, 20 May 2020 08:14:20 +0000 (08:14 +0000)]
[automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours am: 16cbb5a2c8 -s ours am: 1399d250be -s ours

am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: I85655d873a42f83f50a10d3639a73eca156d2f37

4 years ago[automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am...
Treehugger Robot [Wed, 20 May 2020 07:45:30 +0000 (07:45 +0000)]
[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

4 years ago[automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am...
Treehugger Robot [Wed, 20 May 2020 07:26:02 +0000 (07:26 +0000)]
[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

4 years agoMerge "Handle virtio in private fs mapping" am: e471d11d46
Treehugger Robot [Wed, 20 May 2020 07:08:04 +0000 (07:08 +0000)]
Merge "Handle virtio in private fs mapping" am: e471d11d46

Change-Id: If088b875ff4cbca66fe9c6f9224b437edc85dae8

4 years agoMerge "Handle virtio in private fs mapping"
Treehugger Robot [Wed, 20 May 2020 06:32:43 +0000 (06:32 +0000)]
Merge "Handle virtio in private fs mapping"

4 years agoMerge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am...
Automerger Merge Worker [Wed, 20 May 2020 05:25:23 +0000 (05:25 +0000)]
Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11" into rvc-d1-dev-plus-aosp am: 6e535e3eb2

Change-Id: Iab50b51ce33b6ef8c3e1e902c411b85c849c4b29

4 years agoMerge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am...
Automerger Merge Worker [Wed, 20 May 2020 05:25:17 +0000 (05:25 +0000)]
Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b am: f7c0f602d3" into rvc-qpr-dev-plus-aosp

4 years agoMerge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126...
TreeHugger Robot [Wed, 20 May 2020 05:24:54 +0000 (05:24 +0000)]
Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b am: f7c0f602d3

Change-Id: I5c013704f2e5386632ad5575682f314c81c79dee

4 years agoMerge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126...
TreeHugger Robot [Wed, 20 May 2020 05:24:30 +0000 (05:24 +0000)]
Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b am: 43f7db57f6

Change-Id: I9ef2acf09fe51567184ec9aee508c98170424d96

4 years agoMove enabling sdcardfs behind a property
Daniel Rosenberg [Tue, 12 May 2020 05:58:42 +0000 (22:58 -0700)]
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

4 years agoMerge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am...
Automerger Merge Worker [Wed, 20 May 2020 05:00:18 +0000 (05:00 +0000)]
Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11" into rvc-d1-dev-plus-aosp

4 years agoMerge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b
TreeHugger Robot [Wed, 20 May 2020 05:00:00 +0000 (05:00 +0000)]
Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b

Change-Id: I42ca63f91246d722681fc56aaf2a5e125eaf26eb

4 years agoMerge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11
TreeHugger Robot [Wed, 20 May 2020 04:59:50 +0000 (04:59 +0000)]
Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11

Change-Id: Idce31662195bf1a087a949fc4c4483b98d5d62c7

4 years agoMerge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b
TreeHugger Robot [Wed, 20 May 2020 04:59:48 +0000 (04:59 +0000)]
Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b

Change-Id: I5c285cd4cc39c93bcf71bc62ccbaafa618a61440

4 years agoMerge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6
TreeHugger Robot [Wed, 20 May 2020 04:44:11 +0000 (04:44 +0000)]
Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6

Change-Id: I11bc694a26676dd9f8b0fda7f2078a9bc6ed8719

4 years agoMerge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6
TreeHugger Robot [Wed, 20 May 2020 04:44:06 +0000 (04:44 +0000)]
Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6

Change-Id: Idfa020f7211187ddc9c530482de9a53d14ef315a

4 years agoMerge "Handle virtio in private fs mapping" into rvc-dev
TreeHugger Robot [Wed, 20 May 2020 04:28:31 +0000 (04:28 +0000)]
Merge "Handle virtio in private fs mapping" into rvc-dev

4 years agoHandle virtio in private fs mapping
Alistair Delva [Tue, 19 May 2020 22:49:26 +0000 (15:49 -0700)]
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

4 years agoHandle virtio in private fs mapping
Alistair Delva [Tue, 19 May 2020 22:49:26 +0000 (15:49 -0700)]
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

4 years agoMerge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429...
Automerger Merge Worker [Tue, 19 May 2020 23:51:06 +0000 (23:51 +0000)]
Merge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56" into rvc-d1-dev-plus-aosp am: f2922c3057

Change-Id: I1118269081a7d8d0de0dce0d53644ac4a96b78df

4 years agoMerge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429...
Automerger Merge Worker [Tue, 19 May 2020 23:50:33 +0000 (23:50 +0000)]
Merge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: b2c448fa6d am: abf77f1c1c" into rvc-qpr-dev-plus-aosp

4 years agoMerge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a...
Paul Crowley [Tue, 19 May 2020 23:50:22 +0000 (23:50 +0000)]
Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: b2c448fa6d am: abf77f1c1c

Change-Id: I21e6630799f6bbbae97d9480003fa4d283e96b71

4 years agoMerge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a...
Paul Crowley [Tue, 19 May 2020 23:50:21 +0000 (23:50 +0000)]
Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56 am: 60409ffd37

Change-Id: I5704de1a286890c03d5b13891152740d08294701

4 years agoMerge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429...
Automerger Merge Worker [Tue, 19 May 2020 23:33:31 +0000 (23:33 +0000)]
Merge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56" into rvc-d1-dev-plus-aosp

4 years agoMerge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a...
Paul Crowley [Tue, 19 May 2020 23:33:25 +0000 (23:33 +0000)]
Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56

Change-Id: I198643b4e0f8849f51d7c3565a4050549759b06e

4 years agoMerge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a...
Paul Crowley [Tue, 19 May 2020 23:33:24 +0000 (23:33 +0000)]
Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: b2c448fa6d

Change-Id: I4c0150be02af8974c7ab7abb0bb7a2afa42eb9ce

4 years agoMerge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a...
Paul Crowley [Tue, 19 May 2020 23:33:14 +0000 (23:33 +0000)]
Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56

Change-Id: Idaabb296a7c600dcf8d4798a3687e43788e9f00d

4 years agoMerge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a
Paul Crowley [Tue, 19 May 2020 23:12:25 +0000 (23:12 +0000)]
Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a

Change-Id: I2e39a3e24ea8bf488ffb8e901fa6449175673b5c

4 years agoMerge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a
Paul Crowley [Tue, 19 May 2020 23:12:02 +0000 (23:12 +0000)]
Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a

Change-Id: I75726c747937654cdaea15e299cedf0f72c7c5a5

4 years agoMerge "Record use of metadata encryption in property" into rvc-dev
Paul Crowley [Tue, 19 May 2020 22:59:13 +0000 (22:59 +0000)]
Merge "Record use of metadata encryption in property" into rvc-dev

4 years ago[automerger skipped] Merge "Expand virtio_block check to other virtual devices" am...
Treehugger Robot [Sat, 16 May 2020 06:00:04 +0000 (06:00 +0000)]
[automerger skipped] Merge "Expand virtio_block check to other virtual devices" am: ff9975c04f am: edb596fc36 -s ours am: 7c39a18450 -s ours am: e4e2c8de71 -s ours

am skip reason: Change-Id Ieae805d08fddd0124a397636f04d99194a9ef7e5 with SHA-1 ff1fc9bc41 is in history

Change-Id: I09f6c4ec83b1307687ac13b42844712944457f42

4 years ago[automerger skipped] Merge "Expand virtio_block check to other virtual devices" am...
Treehugger Robot [Sat, 16 May 2020 05:43:37 +0000 (05:43 +0000)]
[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

4 years ago[automerger skipped] Merge "Expand virtio_block check to other virtual devices" am...
Treehugger Robot [Sat, 16 May 2020 05:27:30 +0000 (05:27 +0000)]
[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

4 years agoMerge "Expand virtio_block check to other virtual devices" am: ff9975c04f
Treehugger Robot [Sat, 16 May 2020 05:13:11 +0000 (05:13 +0000)]
Merge "Expand virtio_block check to other virtual devices" am: ff9975c04f

Change-Id: Ic604273ddef8ac356e1e23fba050da7d68a24871

4 years agoMerge "Expand virtio_block check to other virtual devices"
Treehugger Robot [Sat, 16 May 2020 04:51:28 +0000 (04:51 +0000)]
Merge "Expand virtio_block check to other virtual devices"

4 years agoExpand virtio_block check to other virtual devices am: ff1fc9bc41 am: 7034b8a926...
Alistair Delva [Sat, 16 May 2020 02:21:39 +0000 (02:21 +0000)]
Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: 7034b8a926 am: 979b3df577

Change-Id: Idf8b1d776930fb91fb5a301fddc69f88a81ba090

4 years agoExpand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5...
Alistair Delva [Sat, 16 May 2020 02:20:37 +0000 (02:20 +0000)]
Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5 am: 67b51e8880

Change-Id: I047a01b8ce6e8c1569113ba0684989613982fb4f

4 years agoExpand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5...
Alistair Delva [Sat, 16 May 2020 02:18:32 +0000 (02:18 +0000)]
Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5 am: af7446f213

Change-Id: I96234d581442d419d93a36129e3ac0fe9014fd59

4 years agoExpand virtio_block check to other virtual devices am: ff1fc9bc41 am: 7034b8a926
Alistair Delva [Sat, 16 May 2020 02:06:37 +0000 (02:06 +0000)]
Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: 7034b8a926

Change-Id: If8eb3d3ba6b8528d85f251542a0a3d3c9f6208c8

4 years agoExpand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5
Alistair Delva [Sat, 16 May 2020 02:06:13 +0000 (02:06 +0000)]
Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5

Change-Id: I4dd6c18980f1dd04302c36fdee5387a94008b3ce

4 years agoExpand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5
Alistair Delva [Sat, 16 May 2020 02:06:11 +0000 (02:06 +0000)]
Expand virtio_block check to other virtual devices am: ff1fc9bc41 am: ac8027eed5

Change-Id: I3000836ad273d36434a2f191d5d96571cc842faa

4 years agoExpand virtio_block check to other virtual devices am: ff1fc9bc41
Alistair Delva [Sat, 16 May 2020 01:48:06 +0000 (01:48 +0000)]
Expand virtio_block check to other virtual devices am: ff1fc9bc41

Change-Id: I679b9ab19d470a14e2708afd9078f2cff599b3b6

4 years agoExpand virtio_block check to other virtual devices am: ff1fc9bc41
Alistair Delva [Sat, 16 May 2020 01:47:58 +0000 (01:47 +0000)]
Expand virtio_block check to other virtual devices am: ff1fc9bc41

Change-Id: I2eda581574e0adecf1617624a66af92b540c35c4

4 years agoExpand virtio_block check to other virtual devices
Alistair Delva [Thu, 14 May 2020 23:35:03 +0000 (16:35 -0700)]
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

4 years agoExpand virtio_block check to other virtual devices
Alistair Delva [Thu, 14 May 2020 23:35:03 +0000 (16:35 -0700)]
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

4 years agoMerge "Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace...
Automerger Merge Worker [Wed, 13 May 2020 15:03:03 +0000 (15:03 +0000)]
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 am: 989b3438c7

Change-Id: If74571424445345ad49cdde1f959b80f0e551a5a

4 years agoMerge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into...
TreeHugger Robot [Wed, 13 May 2020 15:02:42 +0000 (15:02 +0000)]
Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: 08b5b882d6 am: 0cadfb3b15

Change-Id: I61b4678fa1585612c87f2442f235b48255204f10

4 years agoMerge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into...
TreeHugger Robot [Wed, 13 May 2020 15:02:26 +0000 (15:02 +0000)]
Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: 08b5b882d6 am: a78f5bb571

Change-Id: I3e9e9c33ddd1a43ff2d283184df273817ef11150

4 years agoMerge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into...
TreeHugger Robot [Wed, 13 May 2020 14:47:51 +0000 (14:47 +0000)]
Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: 08b5b882d6

Change-Id: I71baa4daf12d0d54ec2cb25f8c8a2391cbd6d421

4 years agoMerge "Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace...
Automerger Merge Worker [Wed, 13 May 2020 14:47:45 +0000 (14:47 +0000)]
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

4 years agoMerge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into...
TreeHugger Robot [Wed, 13 May 2020 14:47:39 +0000 (14:47 +0000)]
Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: a217c25939

Change-Id: I12c4c1965afbcf5022dbba62fbb7e716e4bcb923

4 years agoMerge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into...
TreeHugger Robot [Wed, 13 May 2020 14:47:34 +0000 (14:47 +0000)]
Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a am: 08b5b882d6

Change-Id: I1643a4d1a5f9c29d36de9b5514fea0b40e6c4137

4 years agoRevert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: c0cc8d0322 am: b04d7fa4c0
Satoshi Niwa [Wed, 13 May 2020 14:27:41 +0000 (14:27 +0000)]
Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: c0cc8d0322 am: b04d7fa4c0

Change-Id: I296116019c8f903da0fb150ecb6a39e25b2478a6

4 years agoRevert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332 am: eeaa263f2f
Satoshi Niwa [Wed, 13 May 2020 14:27:33 +0000 (14:27 +0000)]
Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332 am: eeaa263f2f

Change-Id: Ibc41edcc0ef14ff87bd88e181e51d6aa76b4e421

4 years agoMerge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into...
TreeHugger Robot [Wed, 13 May 2020 14:27:28 +0000 (14:27 +0000)]
Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a

Change-Id: I0efd4541ccb6ce75bcb887c03f516b7b6ce41acc

4 years agoRevert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332 am: ae08e4a790
Satoshi Niwa [Wed, 13 May 2020 14:27:20 +0000 (14:27 +0000)]
Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332 am: ae08e4a790

Change-Id: I939f253f69418827272e895ec7a544f3b340bcb5

4 years agoMerge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into...
TreeHugger Robot [Wed, 13 May 2020 14:27:17 +0000 (14:27 +0000)]
Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev am: dbc0da396a

Change-Id: Ib19a8ab5fc09b138b2dae8b1db2003127d277f10

4 years agoMerge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into...
TreeHugger Robot [Wed, 13 May 2020 14:17:04 +0000 (14:17 +0000)]
Merge "Mount storage Android/data and Android/obb as tmpfs in app namespace" into rvc-dev

4 years agoRevert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: c0cc8d0322
Satoshi Niwa [Wed, 13 May 2020 14:16:57 +0000 (14:16 +0000)]
Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: c0cc8d0322

Change-Id: If5e9e03c77bd08588cfbd2dd6a7b4bdebb163895

4 years agoRevert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332
Satoshi Niwa [Wed, 13 May 2020 14:16:54 +0000 (14:16 +0000)]
Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332

Change-Id: I6490832022117fa575263cd5ec52488b9e17ea1b

4 years agoRevert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332
Satoshi Niwa [Wed, 13 May 2020 14:16:48 +0000 (14:16 +0000)]
Revert "ARC++ swap for AppFuseUtil" am: 58d4044082 am: 198657d332

Change-Id: I000153739d24da0f5d3f467c7b45eed342a29a84

4 years agoRevert "ARC++ swap for AppFuseUtil" am: 58d4044082
Satoshi Niwa [Wed, 13 May 2020 14:01:23 +0000 (14:01 +0000)]
Revert "ARC++ swap for AppFuseUtil" am: 58d4044082

Change-Id: I82771efbb0ab25327fca3ffac9f77c3e126bf989

4 years agoRevert "ARC++ swap for AppFuseUtil" am: 58d4044082
Satoshi Niwa [Wed, 13 May 2020 14:00:54 +0000 (14:00 +0000)]
Revert "ARC++ swap for AppFuseUtil" am: 58d4044082

Change-Id: I46e6d976324d956b1ad173ba8ed97de760999451

4 years agoRevert "ARC++ swap for AppFuseUtil"
Satoshi Niwa [Tue, 12 May 2020 14:41:40 +0000 (14:41 +0000)]
Revert "ARC++ swap for AppFuseUtil"

This reverts commit ab7c958cc5ca32aa4f79a6e1fc5784eb3286e326.

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

Bug: 110379912
Test: m
Change-Id: Icc827c59530274421e4c94789d96fd3d287e591e

4 years agoMerge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1 am: 4cf8ddeed2 am: bcbd085...
Treehugger Robot [Tue, 12 May 2020 13:25:58 +0000 (13:25 +0000)]
Merge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1 am: 4cf8ddeed2 am: bcbd085191 am: d35c5afedc

Change-Id: I4a40f83f559951e6137e3cdf00d707d749c2a3e9

4 years agoMerge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1 am: 4cf8ddeed2 am: bcbd085191
Treehugger Robot [Tue, 12 May 2020 13:14:27 +0000 (13:14 +0000)]
Merge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1 am: 4cf8ddeed2 am: bcbd085191

Change-Id: Ibf0fe3a3d1295c5f32edc235b0047807ea8a086a

4 years agoMerge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1 am: 4cf8ddeed2
Treehugger Robot [Tue, 12 May 2020 13:00:16 +0000 (13:00 +0000)]
Merge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1 am: 4cf8ddeed2

Change-Id: I8d91ba35477d526ff886ed32c7c1357134dfca4d

4 years agoMerge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1
Treehugger Robot [Tue, 12 May 2020 12:46:32 +0000 (12:46 +0000)]
Merge "Revert "ARC++ swap for AppFuseUtil"" am: b6e2c14ed1

Change-Id: I3545346238ddaaec8c1a947f00aaeadd12dfd63b

4 years agoMerge "Revert "ARC++ swap for AppFuseUtil""
Treehugger Robot [Tue, 12 May 2020 12:30:16 +0000 (12:30 +0000)]
Merge "Revert "ARC++ swap for AppFuseUtil""

4 years agoRevert "ARC++ swap for AppFuseUtil"
Satoshi Niwa [Fri, 8 May 2020 04:50:34 +0000 (04:50 +0000)]
Revert "ARC++ swap for AppFuseUtil"

This reverts commit dcbd4fcad2b90a6e9376bfe2593ab941966db346.

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

Change-Id: Ifd0bf92a79c0ff25d782bea44dd593f9502f1959

4 years agoMount storage Android/data and Android/obb as tmpfs in app namespace
Ricky Wai [Thu, 7 May 2020 15:01:33 +0000 (16:01 +0100)]
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

4 years agoMerge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc...
Treehugger Robot [Wed, 6 May 2020 18:14:56 +0000 (18:14 +0000)]
Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25 am: 3a149b6735 am: 93dcfef249 am: 045bb64f83

Change-Id: I529f9556fec0c71a7d8fd22263a4d51d2e835950

4 years agoMerge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc...
Treehugger Robot [Wed, 6 May 2020 17:54:35 +0000 (17:54 +0000)]
Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25 am: 3a149b6735 am: 93dcfef249

Change-Id: I452ba7025001f1e2e6bb741679c37a81a86e251e

4 years agoMerge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc...
Treehugger Robot [Wed, 6 May 2020 17:39:50 +0000 (17:39 +0000)]
Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25 am: 3a149b6735

Change-Id: Icb1ef75616ebc3bfe3f1e71a93ca25b42cb348ae

4 years agoMerge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc...
Treehugger Robot [Wed, 6 May 2020 17:22:38 +0000 (17:22 +0000)]
Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure." am: e8acc83d25

Change-Id: I1fb2dbb0de98e3e2deadce25183aa37f2bc7c4ba

4 years agoMerge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure."
Treehugger Robot [Wed, 6 May 2020 17:02:43 +0000 (17:02 +0000)]
Merge "Acknowledge the 'nofail' fs_mgr flag and skip the expected failure."

4 years agoAcknowledge the 'nofail' fs_mgr flag and skip the expected failure.
P.Adarsh Reddy [Thu, 16 Apr 2020 16:16:08 +0000 (21:46 +0530)]
Acknowledge the 'nofail' fs_mgr flag and skip the expected failure.

fs_mgr supports 'nofail' flag, which is used if we do not want to
error-out incase the mounting/setup fails for a partition tagged with
nofail flag in fstab.

Recently added code in vold misses this handling, i.e. it aborts even
for a nofail partition upon encountering an expected failure.

Test: Add a non-existing logical partition fstab entry with 'nofail'
      flag. Init's first stage mount acks this and doesn't crash.
      Vold aborts (as it doesn't handle it), and device doesn't boot.
      With this change, device boots up.

Change-Id: I2b1904a9c648c31bcc05b2e7e77480db236ff66e

4 years agoIntroduce postMount() VolumeBase helper. am: 5ec8658abc am: 82fddb072e am: 0a7a594e77
Martijn Coenen [Wed, 6 May 2020 10:01:32 +0000 (10:01 +0000)]
Introduce postMount() VolumeBase helper. am: 5ec8658abc am: 82fddb072e am: 0a7a594e77

Change-Id: If543c1ac5d6e5c4610bbcb0de6b2c1233999e6ec