OSDN Git Service
Treehugger Robot [Fri, 19 Feb 2021 19:54:09 +0000 (19:54 +0000)]
Merge changes from topic "fsync-fixes" am:
6c36c6f421
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1590896
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifacc42ef9b4abe897a598e3cd8dcef4650b8f5ff
Treehugger Robot [Fri, 19 Feb 2021 19:23:47 +0000 (19:23 +0000)]
Merge changes from topic "fsync-fixes"
* changes:
Add syncs when creating parent directories
Sync parent directory in storeKeyAtomically()
Move pathExists() to Utils.cpp
Dhiraj Jadhav [Thu, 18 Feb 2021 18:45:58 +0000 (18:45 +0000)]
Merge "Revert "Revert "Revert "Set a default ACL on /data/media/userId."""" am:
a98846d8d5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1592902
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7c3c8bd230bcc14471d127ddc2276634cd2b2a43
Dhiraj Jadhav [Thu, 18 Feb 2021 17:38:20 +0000 (17:38 +0000)]
Merge "Revert "Revert "Revert "Set a default ACL on /data/media/userId.""""
Dhiraj Jadhav [Thu, 18 Feb 2021 04:57:03 +0000 (04:57 +0000)]
Revert "Revert "Revert "Set a default ACL on /data/media/userId."""
This reverts commit
ea9681e4cdf30340b583dc27cb6c6474926ddaee.
Reason for revert: storage Permission causing b/
179362637 adb push to fail
Change-Id: Ibc1d8b5b685c22545b7e2d15de58059960b87e14
Eric Biggers [Tue, 16 Feb 2021 23:59:17 +0000 (15:59 -0800)]
Add syncs when creating parent directories
vold creates some directories for storing encryption keys if they don't
already exist, potentially including parent directories:
/metadata/vold/metadata_encryption
/data/misc/vold/volume_keys/$volume_uuid
/data/misc_de/$user/vold/volume_keys/$volume_uuid
/data/misc_ce/$user/vold/volume_keys/$volume_uuid
Currently fs_mkdirs() is used for this. However, fs_mkdirs() doesn't
include the fsync()s of the parent directories that are needed to ensure
that the new directories are persisted to disk right away -- which is
important for encryption keys.
Add a utility function MkdirsSync() which does what is needed, and make
the appropriate places call it.
Test: Booted and checked log for "Created directory" message.
Also ran 'atest vold_tests' to run the new unit test.
Change-Id: Ie9917b616433080139b8db3fd6877203ee6faf77
Eric Biggers [Tue, 16 Feb 2021 23:59:17 +0000 (15:59 -0800)]
Sync parent directory in storeKeyAtomically()
When an FBE or metadata encryption key is created, it's important that
it be persisted to disk right away; otherwise the device may fail to
boot after an unclean shutdown. storeKey() has the needed fsync()s.
However, storeKeyAtomically() doesn't, as it doesn't fsync() the parent
directory of key_path after it renames tmp_path to it.
Two callers do fsync() the parent directory themselves, but others
don't. E.g., the metadata encryption key doesn't get properly synced.
Therefore, add the needed fsync() to storeKeyAtomically() so that it
gets done for everyone.
Also remove the now-unneeded fsync()s from the two callers that did it
themselves.
Change-Id: I342ebd94f0a3d2bf3a7a443c35b6bda0f12e1ab2
Eric Biggers [Tue, 16 Feb 2021 23:59:17 +0000 (15:59 -0800)]
Move pathExists() to Utils.cpp
This is useful as a general utility function.
Change-Id: Id43fc106dc6c544c6e4ce65f10c7d4246b99e54a
Treehugger Robot [Mon, 15 Feb 2021 23:48:04 +0000 (23:48 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold" am:
810bcca4d0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1589008
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9313dcc2a75e117374543fb9050aa1a7e0410f4
Treehugger Robot [Mon, 15 Feb 2021 23:21:47 +0000 (23:21 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold"
Bob Badour [Fri, 12 Feb 2021 22:24:10 +0000 (14:24 -0800)]
[LSC] Add LOCAL_LICENSE_KINDS to system/vold
Added SPDX-license-identifier-Apache-2.0 to:
Android.bp
bench/inodeop_bench/Android.bp
tests/Android.bp
Bug:
68860345
Bug:
151177513
Bug:
151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I91823c7097d7bee39a363a0c0cc30de13e4d7539
Treehugger Robot [Sat, 13 Feb 2021 09:09:08 +0000 (09:09 +0000)]
Merge "Obtain incfs features early in the booting sequence." am:
915f6227a7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1585413
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I695d55952de65a940602efd2387611e00bbde0ec
Treehugger Robot [Sat, 13 Feb 2021 06:32:14 +0000 (06:32 +0000)]
Merge "Obtain incfs features early in the booting sequence."
Alex Buynytskyy [Fri, 12 Feb 2021 03:09:10 +0000 (19:09 -0800)]
Obtain incfs features early in the booting sequence.
Has to be done before SystemConfig initialization to set correct
Incremental version feature.
Bug:
180010901
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest
Change-Id: I262d1f06aecb481f37bf82005c85fed02c476510
Martijn Coenen [Mon, 1 Feb 2021 13:47:40 +0000 (13:47 +0000)]
Merge "Revert "Revert "Set a default ACL on /data/media/userId.""" am:
2e8f0d438b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1566179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4464d2bcb23434832a7448ef59d079079a5c809d
Martijn Coenen [Mon, 1 Feb 2021 13:30:04 +0000 (13:30 +0000)]
Merge "Revert "Revert "Set a default ACL on /data/media/userId."""
Martijn Coenen [Mon, 1 Feb 2021 07:57:02 +0000 (07:57 +0000)]
Revert "Revert "Set a default ACL on /data/media/userId.""
This reverts commit
b276e80aec54c139587bbc510f503ced9414cf0f.
Reason for revert: b/
177926359 is now fixed
Change-Id: I8ec5d80a44fc9e491ab3430592e17d10a82f40ea
Seth Moore [Wed, 27 Jan 2021 01:16:34 +0000 (01:16 +0000)]
Merge "Add support for binding storage encryption to a seed" am:
6207c9cde4
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1553317
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d60971d77f26bb43a73938895f9e343ced7081a
Seth Moore [Wed, 27 Jan 2021 00:40:35 +0000 (00:40 +0000)]
Merge "Add support for binding storage encryption to a seed"
Treehugger Robot [Tue, 26 Jan 2021 23:29:27 +0000 (23:29 +0000)]
Merge "Specify version for aidl_interface explicitly" am:
8e10f698ef
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1560413
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3038929c8745731c9292540e846d6ca34de7cdb7
Treehugger Robot [Tue, 26 Jan 2021 22:28:23 +0000 (22:28 +0000)]
Merge "Specify version for aidl_interface explicitly"
Seth Moore [Tue, 19 Jan 2021 17:51:51 +0000 (17:51 +0000)]
Add support for binding storage encryption to a seed
With this change, vold exposes an API that may be used to bind key
storage encryption keys to a given seed value. The seed value passed to
vold must be consistent across reboots, or key storage keys will not be
derived consistently. The seed is expected to be set very early in boot,
prior to the use of any key storage encryption keys.
This feature is intended to be used for embedded applications such as
in autos, where the seed may be provided by some other component of the
system. In such systems, there is a default user that is automatically
signed in without a PIN or other credentials. By binding the file
encryption to a platform-provided seed, the default user's data gains
additional protection against removal of the Android embedded device
from the integrated system.
Bug:
157501579
Test: Set seed at startup via init.rc. Seed changes fail as expected.
Change-Id: I9b048ec5e045b84c45883724ace2356d4ef6244d
Jeongik Cha [Tue, 26 Jan 2021 13:35:14 +0000 (22:35 +0900)]
Specify version for aidl_interface explicitly
Bug:
150578172
Test: m
Change-Id: Ie51caa503b6b1e5c29372b85d0357be292144126
Martijn Coenen [Thu, 21 Jan 2021 09:40:48 +0000 (09:40 +0000)]
Merge "Revert "Set a default ACL on /data/media/userId."" am:
d9cf8590cb
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1555317
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b2a139c70a8eb29ade6afed2f89cc9141ff149b
Martijn Coenen [Thu, 21 Jan 2021 08:19:20 +0000 (08:19 +0000)]
Merge "Revert "Set a default ACL on /data/media/userId.""
Yifan Hong [Wed, 20 Jan 2021 20:00:06 +0000 (20:00 +0000)]
Merge changes from topic "health_storage_aidl" am:
3355ff7790
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1550388
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I054f6f4345d96f9be12934bb5632951f24ee0ba0
Yifan Hong [Wed, 20 Jan 2021 19:59:59 +0000 (19:59 +0000)]
Refactor HIDL HAL Dev GC invocation am:
8f0d45441c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1550387
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2aeabbe25b138bf43eb1c6ba221126c1f520c227
Yifan Hong [Wed, 20 Jan 2021 19:45:16 +0000 (19:45 +0000)]
Merge changes from topic "health_storage_aidl"
* changes:
Use AIDL HAL for Dev GC
Refactor HIDL HAL Dev GC invocation
Martijn Coenen [Wed, 20 Jan 2021 15:51:44 +0000 (15:51 +0000)]
Revert "Set a default ACL on /data/media/userId."
This reverts commit
a71323ec0ea0927464c7e6f62770ef43f649b3fb.
Reason for revert: b/
177926359 - note that this is a Google testing infrastructure issue, and no issue with this patch. Partners can keep using this patch. It will be resubmitted in a few weeks.
Change-Id: Ia13279ac1aafa2e4425c4527aeadd5d0fadbc2e4
Treehugger Robot [Wed, 20 Jan 2021 11:16:01 +0000 (11:16 +0000)]
Merge "Revert^4 "Customize StubVolume implementation for ARC"" am:
69c97b6d12
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1554975
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I726bc94861fb18e38501ce30ee4d77d2d08eddc0
Treehugger Robot [Wed, 20 Jan 2021 10:33:52 +0000 (10:33 +0000)]
Merge "Revert^4 "Customize StubVolume implementation for ARC""
Risan [Wed, 20 Jan 2021 05:53:15 +0000 (05:53 +0000)]
Revert^4 "Customize StubVolume implementation for ARC"
This reverts commit
8ed81fd9ca4e58231e71a5c59c839d7ba5ca4b3f.
Reason for revert: Let me try one last time more carefully. According to https://googleplex-android-review.git.corp.google.com/q/%2522customize+stubvolume%2522 - this CL will flow to aosp branches (without vendor images) and 2 branches with vendor images. I have submitted the vendor CL for both branches now (ag/
13366009 and ag/
13371672). This should not break anything now.
Change-Id: I69aacceabfb70053387a3c156b49e06be65fe6e4
Maurice Lam [Tue, 19 Jan 2021 21:14:04 +0000 (21:14 +0000)]
Merge "Revert "Revert "Revert "Customize StubVolume implementation for ARC"""" am:
922af320dd
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1554441
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ed3af5a90858ebdb33581d4b63a4a2e5dc58105
Maurice Lam [Tue, 19 Jan 2021 19:28:36 +0000 (19:28 +0000)]
Merge "Revert "Revert "Revert "Customize StubVolume implementation for ARC""""
Maurice Lam [Tue, 19 Jan 2021 19:03:56 +0000 (19:03 +0000)]
Revert "Revert "Revert "Customize StubVolume implementation for ARC"""
This reverts commit
3164c0a2385c9e27f21a6de346de15216d652ec7.
Reason for revert: b/
177917240
Change-Id: I69f541698a3068d59553d555846ba45d169fbbed
rickywai [Tue, 19 Jan 2021 15:58:01 +0000 (15:58 +0000)]
Merge "Call setupAppDir before EnsureDirExists" am:
d4de02ed14
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1553602
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1bcb3c452b77bf46e9b3ce4e9e8ca609470c96a1
rickywai [Tue, 19 Jan 2021 15:24:02 +0000 (15:24 +0000)]
Merge "Call setupAppDir before EnsureDirExists"
Risan [Tue, 19 Jan 2021 11:59:22 +0000 (11:59 +0000)]
Merge "Revert "Revert "Customize StubVolume implementation for ARC""" am:
a8ebbe77a0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1553860
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifed0e9026edb4ef80354e245336c11d4748dc491
Ricky Wai [Tue, 19 Jan 2021 11:27:36 +0000 (11:27 +0000)]
Call setupAppDir before EnsureDirExists
So we can ensure Android/ dir is created,
otherwise EnsureDirExists may return false if Android/ doesn't exist
Bug:
177281374
Test: Able to boot without errors
Change-Id: I02e816b60530ac9d3d3b978a7c9028d2c0e34bad
Risan [Tue, 19 Jan 2021 11:20:08 +0000 (11:20 +0000)]
Merge "Revert "Revert "Customize StubVolume implementation for ARC"""
Martijn Coenen [Tue, 19 Jan 2021 10:25:01 +0000 (10:25 +0000)]
Merge "Set a default ACL on /data/media/userId." am:
14782046f3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1535015
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife277259b3f3ff0e69976cafc8c45db5c3901759
Martijn Coenen [Tue, 19 Jan 2021 09:38:55 +0000 (09:38 +0000)]
Merge "Set a default ACL on /data/media/userId."
Risan [Tue, 19 Jan 2021 02:24:38 +0000 (02:24 +0000)]
Revert "Revert "Customize StubVolume implementation for ARC""
This reverts commit
0cf77b025dd7e9fd92ddf3259de800c19e5db73d.
Reason for revert: The requird libarcvolume has been submitted to master (ag/
13366009)
Change-Id: I86fada53aad2ec5faa497a9bcbce5435c35d040e
Mariia Sandrikova [Mon, 18 Jan 2021 18:18:08 +0000 (18:18 +0000)]
Merge "Revert "Customize StubVolume implementation for ARC"" am:
5558a72d03
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1553535
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5c7f898a1229e2c859a6add61b0024bb95c7d8ce
Mariia Sandrikova [Mon, 18 Jan 2021 18:00:07 +0000 (18:00 +0000)]
Merge "Revert "Customize StubVolume implementation for ARC""
Treehugger Robot [Mon, 18 Jan 2021 16:40:32 +0000 (16:40 +0000)]
Merge "Add a method in vold to unmount app data and obb dir for testing" am:
502c283c22
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1551802
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc8f32345954752f08223bd99e40340759d49abc
Treehugger Robot [Mon, 18 Jan 2021 16:20:41 +0000 (16:20 +0000)]
Merge "Add a method in vold to unmount app data and obb dir for testing"
Mariia Sandrikova [Mon, 18 Jan 2021 15:19:16 +0000 (15:19 +0000)]
Revert "Customize StubVolume implementation for ARC"
This reverts commit
b5d7cb0a523936c79c124220b4df28e4846b0b22.
Reason for revert: Broken build b/
177828900
Fix:
177829766
Change-Id: Ic2984da3b11bcf5597203b511943d3058ea9ea19
Treehugger Robot [Mon, 18 Jan 2021 15:15:43 +0000 (15:15 +0000)]
Merge "Add kVisible flag to vold::Disk" am:
5e103f1106
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1536564
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibfc68bf8cce3b45188747974ac0304c9269d08bc
Treehugger Robot [Mon, 18 Jan 2021 14:54:27 +0000 (14:54 +0000)]
Merge "Add kVisible flag to vold::Disk"
Ricky Wai [Fri, 15 Jan 2021 14:03:23 +0000 (14:03 +0000)]
Add a method in vold to unmount app data and obb dir for testing
This new method will be used in new sm command.
Tests can use this so data and obb dirs are unmounted, and won't
be killed when volume is unmounted.
Bug:
148049767
Test: New sm command able to unmount app's data and obb dirs
Change-Id: Ifbc661ca510e996abd4b7ce1fb195aaa7afc37ad
Risan [Mon, 18 Jan 2021 13:06:47 +0000 (13:06 +0000)]
Merge "Customize StubVolume implementation for ARC" am:
253dd94521
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1532070
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35c24968bf2df577ebdfcefb59d9bb9046405573
Risan [Mon, 18 Jan 2021 12:49:36 +0000 (12:49 +0000)]
Merge "Customize StubVolume implementation for ARC"
Youkichi Hosoi [Tue, 7 Jul 2020 21:08:48 +0000 (06:08 +0900)]
Add kVisible flag to vold::Disk
The new flag is used to indicate that a stub volume (external storage
volume shared with Chrome OS) is visible to Android apps.
Bug:
123377807
Bug:
142684760
Bug:
132796154
Test: Check logcat logs for StorageManagerService.mount() when the
Test: visibility setting of a removable device is toggled in Chrome OS.
Test: Confirm that the visibility setting is properly set.
Test: (Tested in R)
Change-Id: Ica69110d5667837a72a5c8693ff3bccc0f09a82d
Risan [Mon, 28 Dec 2020 20:08:38 +0000 (05:08 +0900)]
Customize StubVolume implementation for ARC
This allow ARC to customize StubVolume implementation in vendor
partition.
Bug:
132796154
Test: Customize the implementation of StubVolume and check on device.
Ignore-AOSP-First: Will cherry-pick to AOSP.
Change-Id: I626a7ed4113b6132bb456b3258ee4a93b4f8a72e
Yifan Hong [Thu, 14 Jan 2021 01:10:47 +0000 (17:10 -0800)]
Refactor HIDL HAL Dev GC invocation
Prefix all HIDL HAL types with the letter H.
Also make the invocation more generic so that we can use
the AIDL implementation in the future.
Test: TH
Bug:
177470478
Change-Id: Iee0af9727c48c532315203c138a4996a08fcaa34
Yifan Hong [Thu, 14 Jan 2021 01:27:42 +0000 (17:27 -0800)]
Use AIDL HAL for Dev GC
Test: run idle maint
Bug:
177470478
Change-Id: Iefddf8628e31f020b86ff56dfb4926c2c9a2a888
rickywai [Fri, 15 Jan 2021 14:21:47 +0000 (14:21 +0000)]
Merge "Remove persist.sys.fuse == false code paths" am:
610eba0ad0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1549441
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4581ca20e4c377957547d1876dee8c20bd53a2ea
rickywai [Fri, 15 Jan 2021 14:00:35 +0000 (14:00 +0000)]
Merge "Remove persist.sys.fuse == false code paths"
Ricky Wai [Thu, 14 Jan 2021 15:51:54 +0000 (15:51 +0000)]
Remove persist.sys.fuse == false code paths
Since Android R, the FUSE prop is always on and FUSE-off is no longer
supported
Test: m
Bug:
160159282
Merged-In: Ic4414b850511fe3b4fc6df3f8b736d21335db820
Change-Id: I5a7643f9ca2f37cd7f264331df76b42df31988d5
Alan Stokes [Tue, 12 Jan 2021 11:34:02 +0000 (11:34 +0000)]
Merge "Remove ro.vold.level_from_user." am:
c0e870af67
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1535004
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35072449979077c9fdfa7bdb93c7018c91dacdb7
Alan Stokes [Tue, 12 Jan 2021 11:17:50 +0000 (11:17 +0000)]
Merge "Remove ro.vold.level_from_user."
rickywai [Fri, 8 Jan 2021 13:37:08 +0000 (13:37 +0000)]
Merge "Vold should still create obb / data dirs for sdcardfs device" am:
f5967975b0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1541768
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ide8c10f8f6da015d94f39754e1b24c9e00c62e6f
rickywai [Fri, 8 Jan 2021 13:14:57 +0000 (13:14 +0000)]
Merge "Vold should still create obb / data dirs for sdcardfs device"
Ricky Wai [Thu, 7 Jan 2021 09:57:44 +0000 (09:57 +0000)]
Vold should still create obb / data dirs for sdcardfs device
Otherwise, zygote can't find those dirs and bind mount them.
Bug:
176959830
Test: atest AdoptableHostTest
Change-Id: Ib8a7616f8e248fed244d4f23d3ae36b1419a732d
Jaegeuk Kim [Wed, 6 Jan 2021 19:43:27 +0000 (19:43 +0000)]
Merge "Let vold format the encrypted partition" am:
9cecd65006
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1530599
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic39f55d0b76e408bef5c1ae410cf194344f494a2
Jaegeuk Kim [Wed, 6 Jan 2021 19:12:35 +0000 (19:12 +0000)]
Merge "Let vold format the encrypted partition"
Alan Stokes [Tue, 22 Dec 2020 14:49:18 +0000 (14:49 +0000)]
Remove ro.vold.level_from_user.
This is on everywhere, we no longer have any need for it.
Fix:
171462631
Test: Presubmits
Change-Id: I240361619acafeee6cac383037887e15a46c0c38
Martijn Coenen [Thu, 24 Dec 2020 09:22:27 +0000 (09:22 +0000)]
Merge "Revert "Set a default ACL on /data/media/userId."" am:
6836a8bda7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1535266
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6148b6f31eda0d01f1db2fc324b6f3425f5eb4ed
Martijn Coenen [Thu, 24 Dec 2020 08:38:02 +0000 (08:38 +0000)]
Merge "Revert "Set a default ACL on /data/media/userId.""
Martijn Coenen [Wed, 16 Dec 2020 08:40:33 +0000 (09:40 +0100)]
Set a default ACL on /data/media/userId.
This directory is used as a root for external storage on adopted storage
devices. It needs to be writable by processes holding the AID_MEDIA_RW
GID permission; in particular, it should be writable by the FUSE daemon.
On devices with sdcardfs, this was ensured automatically, because
sdcardfs presented a view of this directory that was writable, that we
could use for the FUSE daemon. But on devices without sdcardfs, the FUSE
daemon sees the raw filesystem and its permissions. This also means that
files created by the FUSE daemon will have their uid/gid set to the uid
of the FUSE daemon; to ensure these files stay writable to other system
applications that have AID_MEDIA_RW, use a default ACL to make sure the
gid stays AID_MEDIA_RW.
In particular, this fixes an issue with app cloning, where we want the
FUSE daemon of user 0 to be able to access the files of the app clone
user, and vice versa.
Bug:
154057120
Test: inspect uid/gid of /data/media/0 and contents
Change-Id: Ib718b8362df84754ee3cac33865bca3c12df2e3a
Martijn Coenen [Wed, 23 Dec 2020 19:14:15 +0000 (19:14 +0000)]
Revert "Set a default ACL on /data/media/userId."
This reverts commit
8688eb4f47bd589feb2e885836b34c5991158845.
Reason for revert: Probably causing b/
176240229
Change-Id: Id92d1f1589e8927f372960ec2cc5d262d10ad161
Martijn Coenen [Wed, 23 Dec 2020 08:13:14 +0000 (08:13 +0000)]
Merge "Set a default ACL on /data/media/userId." am:
c5c3cdee24
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1530814
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I43a6b3483fa3542f76ebe7961c46560646e7e370
Martijn Coenen [Wed, 23 Dec 2020 07:56:19 +0000 (07:56 +0000)]
Merge "Set a default ACL on /data/media/userId."
Jaegeuk Kim [Tue, 15 Dec 2020 17:00:49 +0000 (09:00 -0800)]
Let vold format the encrypted partition
Bug:
172378121
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I03997eb4cbf25a80e36ea738c50e0adb7f4013dd
Martijn Coenen [Wed, 16 Dec 2020 08:40:33 +0000 (09:40 +0100)]
Set a default ACL on /data/media/userId.
This directory is used as a root for external storage on adopted storage
devices. It needs to be writable by processes holding the AID_MEDIA_RW
GID permission; in particular, it should be writable by the FUSE daemon.
On devices with sdcardfs, this was ensured automatically, because
sdcardfs presented a view of this directory that was writable, that we
could use for the FUSE daemon. But on devices without sdcardfs, the FUSE
daemon sees the raw filesystem and its permissions. This also means that
files created by the FUSE daemon will have their uid/gid set to the uid
of the FUSE daemon; to ensure these files stay writable to other system
applications that have AID_MEDIA_RW, use a default ACL to make sure the
gid stays AID_MEDIA_RW.
In particular, this fixes an issue with app cloning, where we want the
FUSE daemon of user 0 to be able to access the files of the app clone
user, and vice versa.
Bug:
154057120
Test: inspect uid/gid of /data/media/0 and contents
Change-Id: I6dfae41f9cb6a8283978b2667b02708a000f07c0
rickywai [Mon, 14 Dec 2020 14:41:26 +0000 (14:41 +0000)]
Merge "Check if storage app data and obb directories exist in vold" am:
168893621b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1515332
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iabe64c6a23be2df782f7993311c3b89e3bd5a898
rickywai [Mon, 14 Dec 2020 14:24:36 +0000 (14:24 +0000)]
Merge "Check if storage app data and obb directories exist in vold"
Jeffrey Vander Stoep [Thu, 10 Dec 2020 14:11:22 +0000 (14:11 +0000)]
Merge "OWNERS: add alan and jeff, alphabetize" am:
23bfcbb6be
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1523057
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I16e904386de3cbc6be18e1fbfabf5f10fda068ef
Jeffrey Vander Stoep [Thu, 10 Dec 2020 13:59:45 +0000 (13:59 +0000)]
Merge "OWNERS: add alan and jeff, alphabetize"
Alan Stokes [Thu, 10 Dec 2020 12:45:48 +0000 (12:45 +0000)]
Merge "Enable improved user separation by default." am:
9ad4f042ff
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1522938
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03847bcfc16d02713d0edcd1435852a813c80e7a
Alan Stokes [Thu, 10 Dec 2020 12:30:43 +0000 (12:30 +0000)]
Merge "Enable improved user separation by default."
Jeff Vander Stoep [Thu, 10 Dec 2020 12:07:57 +0000 (13:07 +0100)]
OWNERS: add alan and jeff, alphabetize
Test: n/a
Change-Id: I3b9f18906b72d0a3aed712f6c6990180294d0d2b
Alan Stokes [Thu, 10 Dec 2020 09:54:06 +0000 (09:54 +0000)]
Enable improved user separation by default.
This is already on for all Pixel devices with no problems observed.
If this causes issues with a specific device (e.g. vendor apps being
unable to access their data) it can be temporarily disabled by adding
PRODUCT_PROPERTY_OVERRIDES += ro.vold.level_from_user=0
to the device.mk file. Please file a bug if that happens.
Bug:
141677108
Test: presubmits
Change-Id: Ic9da534f1a5f4c9e3bd62ea5c09a3b11ebcb33e7
Merged-In: Ic9da534f1a5f4c9e3bd62ea5c09a3b11ebcb33e7
(cherry picked from commit
763393644a0a6e361f26dfe26f6dc0021579f011)
Ricky Wai [Thu, 3 Dec 2020 15:32:52 +0000 (15:32 +0000)]
Check if storage app data and obb directories exist in vold
As storage is not mounted in system server, we use vold
to check if storage app data and obb directories exist instead.
We add a method in vold so it only creates app data and obb dirs
if dirs do not exist to speed up app starting time.
Bug:
160336374
Test: Data and obb directories are created when a new app is started
Change-Id: I1bd784d9c9e05463f71433fc782ac4e0c831cbf1
Treehugger Robot [Wed, 2 Dec 2020 08:20:27 +0000 (08:20 +0000)]
Merge "Follow vdc naming convention: earlyBootEnded" am:
e8838a862d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1512480
Change-Id: I7df00e8936fd2185541645594a9633317632fe99
Treehugger Robot [Wed, 2 Dec 2020 07:49:38 +0000 (07:49 +0000)]
Merge "Follow vdc naming convention: earlyBootEnded"
Paul Crowley [Tue, 1 Dec 2020 22:36:06 +0000 (14:36 -0800)]
Follow vdc naming convention: earlyBootEnded
vdc commands use camelCase, not kebab-case.
Test: EarlyBootKeyTest.CannotCreateEarlyBootKeys
Change-Id: I7be4d3008a731829e5d5e025216cb2ade238a530
Xin Li [Tue, 24 Nov 2020 00:26:04 +0000 (16:26 -0800)]
Skip rvc-qpr-dev-plus-aosp-without-vendor@
6881855
Bug:
172690556
Merged-In: I51672944372d24483679d6f81df4e80869d3fd99
Change-Id: Ib64d7c9c68de9058bae79d0de9f9c59341d207c3
Martijn Coenen [Thu, 19 Nov 2020 17:48:44 +0000 (17:48 +0000)]
Merge "Convert to lower fs path for createObb()." am:
c237cbc575
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1505371
Change-Id: Ib2cacb3602bc21c5e6d03e15337c188ae2f7bdd5
Martijn Coenen [Thu, 19 Nov 2020 17:48:36 +0000 (17:48 +0000)]
Merge "Unmount pass_through path last." am:
2fb2757c2d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1505131
Change-Id: I16944515f12a656d9b6a2da23a04b7615c9e2f1a
Martijn Coenen [Thu, 19 Nov 2020 17:31:54 +0000 (17:31 +0000)]
Merge "Convert to lower fs path for createObb()."
Martijn Coenen [Thu, 19 Nov 2020 17:31:45 +0000 (17:31 +0000)]
Merge "Unmount pass_through path last."
Martijn Coenen [Thu, 19 Nov 2020 09:49:45 +0000 (10:49 +0100)]
Convert to lower fs path for createObb().
Since /storage/emulated/userId isn't accessible for users != userId,
and vold should anyway try to avoid accessing the FUSE filesystem itself.
Bug:
172078780
Test: atest StorageManagerTest --user-type secondary_user
Change-Id: I98222bf844a6b7d8ec0d9873eddc71f61aa68c90
Martijn Coenen [Thu, 5 Nov 2020 09:34:28 +0000 (10:34 +0100)]
Unmount pass_through path last.
There've been reports of issues where, when a volume is ejected, the
MediaProvider process gets killed. This happens because the
MediaProvider has a file open on the volume (eg, during a scan). We do
abort the scan when the volume is ejected, however this could take some
time. So, we give MediaProvider a bit more time before getting killed,
by only looking for files open on the pass_through paths last. This
order anyway seems to make more sense - ideally we kill apps using
external storage before we unmount the pass_through path underlying it.
Bug:
171367622
Test: atets AdoptableHostTest
Change-Id: Ie8eacaa72a80ff8161ecf1e8c0243afcd890ee39
Martijn Coenen [Wed, 18 Nov 2020 08:09:07 +0000 (08:09 +0000)]
Merge "Call earlyBootEnded from vdc." am:
17ebcf7f99
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1496221
Change-Id: Ib084a4c16c790e274232fd4056b3af4b0e39fff7
Martijn Coenen [Wed, 18 Nov 2020 07:51:31 +0000 (07:51 +0000)]
Merge "Call earlyBootEnded from vdc."
Eric Biggers [Thu, 12 Nov 2020 17:48:16 +0000 (17:48 +0000)]
Merge "Switch to exfatprogs compatible fsck parameter" am:
dfd36fe6b6
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1441937
Change-Id: Ibd14595638ab5daf7965043d64cc5c06dddd1b7c
Eric Biggers [Thu, 12 Nov 2020 17:33:16 +0000 (17:33 +0000)]
Merge "Switch to exfatprogs compatible fsck parameter"
Martijn Coenen [Thu, 12 Nov 2020 09:59:13 +0000 (10:59 +0100)]
Call earlyBootEnded from vdc.
This allows us to determine the place where early boot ends from init.
It also allows fixing a bug where early boot wasn't ended previously on
devices without metadata encryption.
Bug:
168585635
Bug:
173005594
Test: inspect logs
Change-Id: I78775672a7d3c140e007235a10fb1d1bc816fcee