OSDN Git Service

android-x86/system-vold.git
3 years agoMerge "Set a default ACL on /data/media/userId." am: f6546171af am: ca3fbd1e4b
Treehugger Robot [Tue, 2 Mar 2021 19:47:14 +0000 (19:47 +0000)]
Merge "Set a default ACL on /data/media/userId." am: f6546171af am: ca3fbd1e4b

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1603534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4f7ecc6b6e53fc9f61a4e83027ebb7a86b69b86

3 years agoMerge "Set a default ACL on /data/media/userId." am: f6546171af
Treehugger Robot [Tue, 2 Mar 2021 19:03:54 +0000 (19:03 +0000)]
Merge "Set a default ACL on /data/media/userId." am: f6546171af

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1603534

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I13d1ee215c805b25d73e3d39508ea05cdc60b703

3 years agoMerge "Set a default ACL on /data/media/userId."
Treehugger Robot [Tue, 2 Mar 2021 09:25:52 +0000 (09:25 +0000)]
Merge "Set a default ACL on /data/media/userId."

3 years agoMerge "[vold] expose binder headers to dependent modules" am: 51ff06df22 am: b06061cace
Treehugger Robot [Fri, 26 Feb 2021 05:24:15 +0000 (05:24 +0000)]
Merge "[vold] expose binder headers to dependent modules" am: 51ff06df22 am: b06061cace

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1607482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3321467c877bf1518594ea190cc109be9a0e483

3 years agoMerge "[vold] expose binder headers to dependent modules" am: 51ff06df22
Treehugger Robot [Fri, 26 Feb 2021 04:33:56 +0000 (04:33 +0000)]
Merge "[vold] expose binder headers to dependent modules" am: 51ff06df22

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1607482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32b3d8d656a07491b644c8fd05aa38b8031597a4

3 years agoMerge "[vold] expose binder headers to dependent modules"
Treehugger Robot [Fri, 26 Feb 2021 03:35:10 +0000 (03:35 +0000)]
Merge "[vold] expose binder headers to dependent modules"

3 years ago[vold] expose binder headers to dependent modules
Songchun Fan [Thu, 25 Feb 2021 23:16:11 +0000 (23:16 +0000)]
[vold] expose binder headers to dependent modules

This allows libincremental_aidl-cpp to be built via cc_library instead
of aidl_interface.

BUG: 181266844
Test: builds
Change-Id: I4f0bc82629c0df758467aa074274b30f9dc6718d

3 years agoMerge "vold: Use Wakelock::tryGet()" am: 8439ab27d6 am: c08bc3b0b8
Kalesh Singh [Wed, 24 Feb 2021 22:58:01 +0000 (22:58 +0000)]
Merge "vold: Use Wakelock::tryGet()" am: 8439ab27d6 am: c08bc3b0b8

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1600813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0eb444a328513b3fbe4b9818268cff319c53ae3

3 years agoMerge "vold: Use Wakelock::tryGet()" am: 8439ab27d6
Kalesh Singh [Wed, 24 Feb 2021 22:14:06 +0000 (22:14 +0000)]
Merge "vold: Use Wakelock::tryGet()" am: 8439ab27d6

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1600813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b028c047da40cbbd20c0a99d4c957d87bfcf0c2

3 years agoMerge "vold: Use Wakelock::tryGet()"
Kalesh Singh [Wed, 24 Feb 2021 18:49:58 +0000 (18:49 +0000)]
Merge "vold: Use Wakelock::tryGet()"

3 years agoSet a default ACL on /data/media/userId.
Martijn Coenen [Mon, 1 Feb 2021 07:57:02 +0000 (07:57 +0000)]
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: Ic5d63457ec917ea407b900dbb7773d89311780c6

3 years agovold: Use Wakelock::tryGet()
Kalesh Singh [Mon, 22 Feb 2021 20:10:45 +0000 (15:10 -0500)]
vold: Use Wakelock::tryGet()

Acquiring a wakelock can fail if the suspend service is unavailable.
Explicitly check that wakelock was acquired before performing
operations that require the device to stay on.

Bug: b/179229598
Test: Boot test on Pixel 4 device
Change-Id: If30087223e44098801a31d1bfd239ac22e891abe

3 years ago[automerger skipped] Mark ab/7061308 as merged in stage. am: 0ee13dfc4f -s ours
Xin Li [Sat, 20 Feb 2021 12:28:42 +0000 (12:28 +0000)]
[automerger skipped] Mark ab/7061308 as merged in stage. am: 0ee13dfc4f -s ours

am skip reason: Change-Id I7124285f41c6a854ad5c86677bc94d78ddca5a97 with SHA-1 60537dad69 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50546bc29bc2fcd0dee816ded8d45d9b355c4eb1

3 years agoMark ab/7061308 as merged in stage.
Xin Li [Sat, 20 Feb 2021 08:24:42 +0000 (00:24 -0800)]
Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: I7124285f41c6a854ad5c86677bc94d78ddca5a97
Change-Id: Icf8db3d8557a3835e0834eec134bb4b111ec3af0

3 years agoMerge changes from topic "fsync-fixes" am: 6c36c6f421 am: 2a3e67a9e0
Treehugger Robot [Fri, 19 Feb 2021 20:42:12 +0000 (20:42 +0000)]
Merge changes from topic "fsync-fixes" am: 6c36c6f421 am: 2a3e67a9e0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1590896

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf2e04c47b38e917bf58afcfbd78b7a0a395c141

3 years agoMerge changes from topic "fsync-fixes" am: 6c36c6f421
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

3 years agoMerge changes from topic "fsync-fixes"
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

3 years agoMerge "Revert "Revert "Revert "Set a default ACL on /data/media/userId."""" am: a9884...
Dhiraj Jadhav [Thu, 18 Feb 2021 19:13:34 +0000 (19:13 +0000)]
Merge "Revert "Revert "Revert "Set a default ACL on /data/media/userId."""" am: a98846d8d5 am: 375884bd0a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1592902

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38ed5d51a2f7712bf6a72b01f35e4c99a4edb43f

3 years agoMerge "Revert "Revert "Revert "Set a default ACL on /data/media/userId."""" am: a9884...
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

3 years agoMerge "Revert "Revert "Revert "Set a default ACL on /data/media/userId.""""
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.""""

3 years agoRevert "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

3 years agoAdd syncs when creating parent directories
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

3 years agoSync parent directory in storeKeyAtomically()
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

3 years agoMove pathExists() to Utils.cpp
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

3 years agoMerge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold" am: 810bcca4d0 am: c7c9cfbf9f
Treehugger Robot [Tue, 16 Feb 2021 00:31:33 +0000 (00:31 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold" am: 810bcca4d0 am: c7c9cfbf9f

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1589008

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8dbb252b72c8c7c102ed39747be613d16707121

3 years agoMerge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold" am: 810bcca4d0
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

3 years agoMerge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold"
Treehugger Robot [Mon, 15 Feb 2021 23:21:47 +0000 (23:21 +0000)]
Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold"

3 years ago[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

3 years agoMerge "Obtain incfs features early in the booting sequence." am: 915f6227a7 am: a9838...
Treehugger Robot [Sat, 13 Feb 2021 09:44:00 +0000 (09:44 +0000)]
Merge "Obtain incfs features early in the booting sequence." am: 915f6227a7 am: a9838cc3d3

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1585413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04cd9b63a12e5ca9eacf2cb26be83a903893e1d5

3 years agoMerge "Obtain incfs features early in the booting sequence." am: 915f6227a7
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

3 years agoMerge "Obtain incfs features early in the booting sequence."
Treehugger Robot [Sat, 13 Feb 2021 06:32:14 +0000 (06:32 +0000)]
Merge "Obtain incfs features early in the booting sequence."

3 years agoObtain 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

3 years agoMerge "Revert "Revert "Set a default ACL on /data/media/userId.""" am: 2e8f0d438b...
Martijn Coenen [Mon, 1 Feb 2021 14:06:58 +0000 (14:06 +0000)]
Merge "Revert "Revert "Set a default ACL on /data/media/userId.""" am: 2e8f0d438b am: 62ed9d52db

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1566179

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f8b60b5d0345ae7563446d90125bfbbc7b93371

3 years agoMerge "Revert "Revert "Set a default ACL on /data/media/userId.""" am: 2e8f0d438b
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

3 years agoMerge "Revert "Revert "Set a default ACL on /data/media/userId."""
Martijn Coenen [Mon, 1 Feb 2021 13:30:04 +0000 (13:30 +0000)]
Merge "Revert "Revert "Set a default ACL on /data/media/userId."""

3 years agoRevert "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

3 years agoMerge "Add support for binding storage encryption to a seed" am: 6207c9cde4 am: 4c110...
Seth Moore [Wed, 27 Jan 2021 01:36:30 +0000 (01:36 +0000)]
Merge "Add support for binding storage encryption to a seed" am: 6207c9cde4 am: 4c110af013

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1553317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2d7a8c3538ab8c43e1fe4d783bf2b5d83c826ca

3 years agoMerge "Add support for binding storage encryption to a seed" am: 6207c9cde4
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

3 years agoMerge "Add support for binding storage encryption to a seed"
Seth Moore [Wed, 27 Jan 2021 00:40:35 +0000 (00:40 +0000)]
Merge "Add support for binding storage encryption to a seed"

3 years agoMerge "Specify version for aidl_interface explicitly" am: 8e10f698ef am: 5f6d86597e
Treehugger Robot [Tue, 26 Jan 2021 23:52:09 +0000 (23:52 +0000)]
Merge "Specify version for aidl_interface explicitly" am: 8e10f698ef am: 5f6d86597e

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1560413

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bd8294901a465547eca3bac81359d892cfef94c

3 years agoMerge "Specify version for aidl_interface explicitly" am: 8e10f698ef
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

3 years agoMerge "Specify version for aidl_interface explicitly"
Treehugger Robot [Tue, 26 Jan 2021 22:28:23 +0000 (22:28 +0000)]
Merge "Specify version for aidl_interface explicitly"

3 years agoAdd support for binding storage encryption to a seed
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

3 years agoSpecify version for aidl_interface explicitly
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

3 years agoMerge "Revert "Set a default ACL on /data/media/userId."" am: d9cf8590cb am: 42c41b5b47
Martijn Coenen [Thu, 21 Jan 2021 10:00:20 +0000 (10:00 +0000)]
Merge "Revert "Set a default ACL on /data/media/userId."" am: d9cf8590cb am: 42c41b5b47

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1555317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bf3ef0ce4d2c0fd5c50a84c3116949cf1c79893

3 years agoMerge "Revert "Set a default ACL on /data/media/userId."" am: d9cf8590cb
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

3 years agoMerge "Revert "Set a default ACL on /data/media/userId.""
Martijn Coenen [Thu, 21 Jan 2021 08:19:20 +0000 (08:19 +0000)]
Merge "Revert "Set a default ACL on /data/media/userId.""

3 years agoMerge changes from topic "health_storage_aidl" am: 3355ff7790 am: 92e9e5d1ad
Yifan Hong [Wed, 20 Jan 2021 20:27:54 +0000 (20:27 +0000)]
Merge changes from topic "health_storage_aidl" am: 3355ff7790 am: 92e9e5d1ad

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1550388

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I500d3ccab2b4a19e71d292d17d7fac2c39e0355f

3 years agoRefactor HIDL HAL Dev GC invocation am: 8f0d45441c am: b586527450
Yifan Hong [Wed, 20 Jan 2021 20:27:46 +0000 (20:27 +0000)]
Refactor HIDL HAL Dev GC invocation am: 8f0d45441c am: b586527450

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1550387

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22889d60d91b7b4cdd8de0a8b5d429bf1abc1457

3 years agoMerge changes from topic "health_storage_aidl" am: 3355ff7790
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

3 years agoRefactor HIDL HAL Dev GC invocation am: 8f0d45441c
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

3 years agoMerge changes from topic "health_storage_aidl"
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

3 years agoRevert "Set a default ACL on /data/media/userId."
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

3 years agoMerge "Revert^4 "Customize StubVolume implementation for ARC"" am: 69c97b6d12 am...
Treehugger Robot [Wed, 20 Jan 2021 11:32:18 +0000 (11:32 +0000)]
Merge "Revert^4 "Customize StubVolume implementation for ARC"" am: 69c97b6d12 am: 500bfa9d4a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1554975

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefc396b4e6fed386f1831ced9235a4295d1d9a92

3 years agoMerge "Revert^4 "Customize StubVolume implementation for ARC"" am: 69c97b6d12
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

3 years agoMerge "Revert^4 "Customize StubVolume implementation for ARC""
Treehugger Robot [Wed, 20 Jan 2021 10:33:52 +0000 (10:33 +0000)]
Merge "Revert^4 "Customize StubVolume implementation for ARC""

3 years agoRevert^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

3 years agoMerge "Revert "Revert "Revert "Customize StubVolume implementation for ARC"""" am...
Maurice Lam [Tue, 19 Jan 2021 22:06:02 +0000 (22:06 +0000)]
Merge "Revert "Revert "Revert "Customize StubVolume implementation for ARC"""" am: 922af320dd am: 4e77967775

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1554441

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c05660893db14945a61d6f378d28a2249f29b75

3 years agoMerge "Revert "Revert "Revert "Customize StubVolume implementation for ARC"""" am...
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

3 years agoMerge "Revert "Revert "Revert "Customize StubVolume implementation for ARC""""
Maurice Lam [Tue, 19 Jan 2021 19:28:36 +0000 (19:28 +0000)]
Merge "Revert "Revert "Revert "Customize StubVolume implementation for ARC""""

3 years agoRevert "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

3 years agoMerge "Call setupAppDir before EnsureDirExists" am: d4de02ed14 am: f44cf21080
rickywai [Tue, 19 Jan 2021 16:44:52 +0000 (16:44 +0000)]
Merge "Call setupAppDir before EnsureDirExists" am: d4de02ed14 am: f44cf21080

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1553602

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53ebb973e11e87f4404d13089848b8115bbbee05

3 years agoMerge "Call setupAppDir before EnsureDirExists" am: d4de02ed14
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

3 years agoMerge "Call setupAppDir before EnsureDirExists"
rickywai [Tue, 19 Jan 2021 15:24:02 +0000 (15:24 +0000)]
Merge "Call setupAppDir before EnsureDirExists"

3 years agoMerge "Revert "Revert "Customize StubVolume implementation for ARC""" am: a8ebbe77a0...
Risan [Tue, 19 Jan 2021 12:41:15 +0000 (12:41 +0000)]
Merge "Revert "Revert "Customize StubVolume implementation for ARC""" am: a8ebbe77a0 am: 1932006a8f

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1553860

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33ba2498088d4f307d35eb3460fb84b9ddbfaca6

3 years agoMerge "Revert "Revert "Customize StubVolume implementation for ARC""" am: a8ebbe77a0
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

3 years agoCall setupAppDir before EnsureDirExists
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

3 years agoMerge "Revert "Revert "Customize StubVolume implementation for ARC"""
Risan [Tue, 19 Jan 2021 11:20:08 +0000 (11:20 +0000)]
Merge "Revert "Revert "Customize StubVolume implementation for ARC"""

3 years agoMerge "Set a default ACL on /data/media/userId." am: 14782046f3 am: 90795b62da
Martijn Coenen [Tue, 19 Jan 2021 11:03:38 +0000 (11:03 +0000)]
Merge "Set a default ACL on /data/media/userId." am: 14782046f3 am: 90795b62da

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1535015

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4b8667b466d1f8e25d7472d2837293f69efbdfd

3 years agoMerge "Set a default ACL on /data/media/userId." am: 14782046f3
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

3 years agoMerge "Set a default ACL on /data/media/userId."
Martijn Coenen [Tue, 19 Jan 2021 09:38:55 +0000 (09:38 +0000)]
Merge "Set a default ACL on /data/media/userId."

3 years agoRevert "Revert "Customize StubVolume implementation for ARC""
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

3 years agoMerge "Revert "Customize StubVolume implementation for ARC"" am: 5558a72d03 am: 4e8b1...
Mariia Sandrikova [Mon, 18 Jan 2021 18:37:27 +0000 (18:37 +0000)]
Merge "Revert "Customize StubVolume implementation for ARC"" am: 5558a72d03 am: 4e8b1631b6

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1553535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33017ec3e299ee6f9d4e3e7885942352b9db3482

3 years agoMerge "Revert "Customize StubVolume implementation for ARC"" am: 5558a72d03
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

3 years agoMerge "Revert "Customize StubVolume implementation for ARC""
Mariia Sandrikova [Mon, 18 Jan 2021 18:00:07 +0000 (18:00 +0000)]
Merge "Revert "Customize StubVolume implementation for ARC""

3 years agoMerge "Add a method in vold to unmount app data and obb dir for testing" am: 502c283c...
Treehugger Robot [Mon, 18 Jan 2021 17:05:40 +0000 (17:05 +0000)]
Merge "Add a method in vold to unmount app data and obb dir for testing" am: 502c283c22 am: 9ae91a47f9

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1551802

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fd582ef8ba619e39a024b5d0684b9aea110aa33

3 years agoMerge "Add a method in vold to unmount app data and obb dir for testing" am: 502c283c22
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

3 years agoMerge "Add kVisible flag to vold::Disk" am: 5e103f1106 am: be4467f180
Treehugger Robot [Mon, 18 Jan 2021 16:25:48 +0000 (16:25 +0000)]
Merge "Add kVisible flag to vold::Disk" am: 5e103f1106 am: be4467f180

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1536564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98a750fac1377168a77d6c4c2ca229335209ae2e

3 years agoMerge "Add a method in vold to unmount app data and obb dir for testing"
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"

3 years agoRevert "Customize StubVolume implementation for ARC"
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

3 years agoMerge "Add kVisible flag to vold::Disk" am: 5e103f1106
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

3 years agoMerge "Add kVisible flag to vold::Disk"
Treehugger Robot [Mon, 18 Jan 2021 14:54:27 +0000 (14:54 +0000)]
Merge "Add kVisible flag to vold::Disk"

3 years agoAdd a method in vold to unmount app data and obb dir for testing
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

3 years agoMerge "Customize StubVolume implementation for ARC" am: 253dd94521 am: 802d1d256a
Risan [Mon, 18 Jan 2021 13:27:31 +0000 (13:27 +0000)]
Merge "Customize StubVolume implementation for ARC" am: 253dd94521 am: 802d1d256a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1532070

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58e6378fbe15bc038d34f9a2699bce7b50625df9

3 years agoMerge "Customize StubVolume implementation for ARC" am: 253dd94521
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

3 years agoMerge "Customize StubVolume implementation for ARC"
Risan [Mon, 18 Jan 2021 12:49:36 +0000 (12:49 +0000)]
Merge "Customize StubVolume implementation for ARC"

3 years agoAdd kVisible flag to vold::Disk
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

3 years agoCustomize StubVolume implementation for ARC
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

3 years agoRefactor HIDL HAL Dev GC invocation
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

3 years agoUse AIDL HAL for Dev GC
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

3 years agoMerge "Remove persist.sys.fuse == false code paths" am: 610eba0ad0 am: 9aee3a9513
rickywai [Fri, 15 Jan 2021 15:28:51 +0000 (15:28 +0000)]
Merge "Remove persist.sys.fuse == false code paths" am: 610eba0ad0 am: 9aee3a9513

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1549441

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23d39e99e863437a7958a7b17d7ddb262a04f924

3 years agoMerge "Remove persist.sys.fuse == false code paths" am: 610eba0ad0
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

3 years agoMerge "Remove persist.sys.fuse == false code paths"
rickywai [Fri, 15 Jan 2021 14:00:35 +0000 (14:00 +0000)]
Merge "Remove persist.sys.fuse == false code paths"

3 years agoRemove 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

3 years agoMerge "Remove ro.vold.level_from_user." am: c0e870af67 am: 972317ce6d
Alan Stokes [Tue, 12 Jan 2021 12:42:47 +0000 (12:42 +0000)]
Merge "Remove ro.vold.level_from_user." am: c0e870af67 am: 972317ce6d

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1535004

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaac98f9b15152b36560d5188d848228b9eb28267

3 years agoMerge "Remove ro.vold.level_from_user." am: c0e870af67
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

3 years agoMerge "Remove ro.vold.level_from_user."
Alan Stokes [Tue, 12 Jan 2021 11:17:50 +0000 (11:17 +0000)]
Merge "Remove ro.vold.level_from_user."

3 years agoMerge "Vold should still create obb / data dirs for sdcardfs device" am: f5967975b0...
rickywai [Fri, 8 Jan 2021 14:15:40 +0000 (14:15 +0000)]
Merge "Vold should still create obb / data dirs for sdcardfs device" am: f5967975b0 am: 61d8298959

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1541768

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69032e9c77b3b91269ea1cc5aba0f277e486b54e

3 years agoMerge "Vold should still create obb / data dirs for sdcardfs device" am: f5967975b0
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

3 years agoMerge "Vold should still create obb / data dirs for sdcardfs device"
rickywai [Fri, 8 Jan 2021 13:14:57 +0000 (13:14 +0000)]
Merge "Vold should still create obb / data dirs for sdcardfs device"