git.osdn.net Git - android-x86/system-vold.git/log

OSDN Git Service

(root) / android-x86 / system-vold.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Eric Biggers [Mon, 15 Mar 2021 19:44:36 +0000 (12:44 -0700)]

KeyStorage: improve logging for key generation

The error messages that are printed when probing for rollback resistance
support on a device that doesn't support rollback-resistant keys can
make it sound like something is going wrong.  Print a WARNING message
afterwards to try to make it clear what is going on.  Also adjust or add
DEBUG messages when starting to generate each key so that it's easier to
distinguish the log messages for different key generation operations.

Bug: 182815123
Test: boot on device that doesn't support rollback-resistant keys and
      check log.
Change-Id: I37a13eb5c1e839fb94581f3e7ec1cd8da0263d2b
Merged-In: I37a13eb5c1e839fb94581f3e7ec1cd8da0263d2b

commit | commitdiff | tree

Treehugger Robot [Fri, 5 Mar 2021 20:39:30 +0000 (20:39 +0000)]

Merge "Avoid killing the FUSE daemon during unmount" am: 05bb5cc71e am: 5e953c70fc am: a02960e5ed

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I789eb902ba1a686753d85a6d57efeb5741423ce3

commit | commitdiff | tree

Treehugger Robot [Fri, 5 Mar 2021 19:57:22 +0000 (19:57 +0000)]

Merge "Avoid killing the FUSE daemon during unmount" am: 05bb5cc71e am: 5e953c70fc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I769ded970fbf021c241043063e34758bfebada98

commit | commitdiff | tree

Treehugger Robot [Fri, 5 Mar 2021 18:47:05 +0000 (18:47 +0000)]

Merge "Avoid killing the FUSE daemon during unmount" am: 05bb5cc71e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ce3bb0d699478ac00ca25a72d3b4dd0c63d2c1

commit | commitdiff | tree

Treehugger Robot [Fri, 5 Mar 2021 18:08:14 +0000 (18:08 +0000)]

Merge "Avoid killing the FUSE daemon during unmount"

commit | commitdiff | tree

Zim [Thu, 4 Mar 2021 12:21:24 +0000 (12:21 +0000)]

Avoid killing the FUSE daemon during unmount

The FUSE daemon is often holding fds on behalf of other apps and if a
volume is ejected the daemon would often get killed first while vold
is walking /proc/<pid>/fd to kill pids with open fds on the
volume. This is required for the volume unmount successfully.

To mitigate this, we avoid killing the FUSE daemon during the usual
/proc walk. This ensures that we first send SIGINT, SIGTERM and
SIGKILL to other apps first. There is an additional SIGKILL attempt
and on that last attempt, we kill the FUSE daemon as a last resort

Test: Manual
Bug: 171673908
Change-Id: I100d2ce4cb4c145cbb49e0696842e97dfba2c1c9

commit | commitdiff | tree

Abhijeet Kaur [Wed, 3 Mar 2021 13:32:00 +0000 (13:32 +0000)]

Merge "Remove unused mount modes and re-number the modes for consistency" am: 2d0ea90538 am: 6111dc99fe am: 7d0b75e407

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83fd80266a5b558b899963554950b20f5bf56e83

commit | commitdiff | tree

Abhijeet Kaur [Wed, 3 Mar 2021 13:02:43 +0000 (13:02 +0000)]

Merge "Remove unused mount modes and re-number the modes for consistency" am: 2d0ea90538 am: 6111dc99fe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic29cce9e12067fdc7ea4827bb25210af7420cd4e

commit | commitdiff | tree

Abhijeet Kaur [Wed, 3 Mar 2021 11:12:54 +0000 (11:12 +0000)]

Merge "Remove unused mount modes and re-number the modes for consistency" am: 2d0ea90538

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I958437ce02963f69c3498ef829e9bcbef27dabd4

commit | commitdiff | tree

Abhijeet Kaur [Wed, 3 Mar 2021 10:09:46 +0000 (10:09 +0000)]

Merge "Remove unused mount modes and re-number the modes for consistency"

commit | commitdiff | tree

Treehugger Robot [Tue, 2 Mar 2021 20:40:14 +0000 (20:40 +0000)]

Merge "Set a default ACL on /data/media/userId." am: f6546171af am: ca3fbd1e4b am: 541c8e03f2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I935e9217d592818c5df46941e2b303134a15f0f7

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 2 Mar 2021 09:25:52 +0000 (09:25 +0000)]

Merge "Set a default ACL on /data/media/userId."

commit | commitdiff | tree

Treehugger Robot [Fri, 26 Feb 2021 06:07:25 +0000 (06:07 +0000)]

Merge "[vold] expose binder headers to dependent modules" am: 51ff06df22 am: b06061cace am: c0bd8a260d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7f00620faf15b159537820136df13b3ac628616

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 26 Feb 2021 03:35:10 +0000 (03:35 +0000)]

Merge "[vold] expose binder headers to dependent modules"

commit | commitdiff | tree

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

commit | commitdiff | tree

Kalesh Singh [Wed, 24 Feb 2021 23:51:50 +0000 (23:51 +0000)]

Merge "vold: Use Wakelock::tryGet()" am: 8439ab27d6 am: c08bc3b0b8 am: bda3d905bd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I254c60898eb5a8b2aaa157fa31a4a439f6680a38

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kalesh Singh [Wed, 24 Feb 2021 18:49:58 +0000 (18:49 +0000)]

Merge "vold: Use Wakelock::tryGet()"

commit | commitdiff | tree

Abhijeet Kaur [Wed, 24 Feb 2021 12:33:25 +0000 (12:33 +0000)]

Remove unused mount modes and re-number the modes for consistency

Also, add REMOUNT_MODE_ANDROID_WRITABLE to return "/mnt/runtime/write".

Bug: 148454884
Test: builds
Change-Id: I5a38c88f46034c494604bb001cf4d4c400c8f73e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Xin Li [Sat, 20 Feb 2021 13:38:43 +0000 (13:38 +0000)]

[automerger skipped] Mark ab/7061308 as merged in stage. am: 0ee13dfc4f -s ours am: 9ee62187e7 -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: I2d2f9234a82f959148a047d2e6e91fd90182b96c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 19 Feb 2021 22:05:25 +0000 (22:05 +0000)]

Merge changes from topic "fsync-fixes" am: 6c36c6f421 am: 2a3e67a9e0 am: 85956f9525

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d2bc6467b35b2df1aff79e4765bdd103c7b572a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dhiraj Jadhav [Thu, 18 Feb 2021 19:33:21 +0000 (19:33 +0000)]

Merge "Revert "Revert "Revert "Set a default ACL on /data/media/userId."""" am: a98846d8d5 am: 375884bd0a am: e5d8fe2474

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0b6cab9e43d08c5d5e1f6f37a9ce3f7fee35e0e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.""""

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 16 Feb 2021 01:02:04 +0000 (01:02 +0000)]

Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold" am: 810bcca4d0 am: c7c9cfbf9f am: 64d5e281ad

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib75d7199304e2ed5da6d6145d8be1ce1f06e3327

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Mon, 15 Feb 2021 23:21:47 +0000 (23:21 +0000)]

Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold"

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Sat, 13 Feb 2021 10:16:50 +0000 (10:16 +0000)]

Merge "Obtain incfs features early in the booting sequence." am: 915f6227a7 am: a9838cc3d3 am: ef885d3deb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1af24c06a0fa58f11a754bfc22b43f0a7837e12b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Sat, 13 Feb 2021 06:32:14 +0000 (06:32 +0000)]

Merge "Obtain incfs features early in the booting sequence."

commit | commitdiff | tree

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

commit | commitdiff | tree

Martijn Coenen [Mon, 1 Feb 2021 14:51:31 +0000 (14:51 +0000)]

Merge "Revert "Revert "Set a default ACL on /data/media/userId.""" am: 2e8f0d438b am: 62ed9d52db am: dd6ebf8878

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id79ce8f618bf52e166cb0d0dbec0856c1435581e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Martijn Coenen [Mon, 1 Feb 2021 13:30:04 +0000 (13:30 +0000)]

Merge "Revert "Revert "Set a default ACL on /data/media/userId."""

commit | commitdiff | tree

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

commit | commitdiff | tree

Seth Moore [Wed, 27 Jan 2021 04:19:46 +0000 (04:19 +0000)]

Merge "Add support for binding storage encryption to a seed" am: 6207c9cde4 am: 4c110af013 am: 0bdfada404

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I496422108eedcb352d2fb45181ba4fc035c59e19

commit | commitdiff | tree

Treehugger Robot [Wed, 27 Jan 2021 04:16:35 +0000 (04:16 +0000)]

Merge "Specify version for aidl_interface explicitly" am: 8e10f698ef am: 5f6d86597e am: 97bc46aabd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I667a54723d93a39150bd9044c6d4306942a63ea2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Seth Moore [Wed, 27 Jan 2021 00:40:35 +0000 (00:40 +0000)]

Merge "Add support for binding storage encryption to a seed"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 26 Jan 2021 22:28:23 +0000 (22:28 +0000)]

Merge "Specify version for aidl_interface explicitly"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Yurii Zubrytskyi [Mon, 25 Jan 2021 16:47:23 +0000 (16:47 +0000)]

Merge "IncFS: pass over the new .blocks_written IncFS control file"

commit | commitdiff | tree

Martijn Coenen [Thu, 21 Jan 2021 10:29:41 +0000 (10:29 +0000)]

Merge "Revert "Set a default ACL on /data/media/userId."" am: d9cf8590cb am: 42c41b5b47 am: 90dbb464fe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04519a7ceef5d44ebb73b0f4dcb3025f3a26ad6c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Martijn Coenen [Thu, 21 Jan 2021 08:19:20 +0000 (08:19 +0000)]

Merge "Revert "Set a default ACL on /data/media/userId.""

commit | commitdiff | tree

Yifan Hong [Wed, 20 Jan 2021 20:49:06 +0000 (20:49 +0000)]

Merge changes from topic "health_storage_aidl" am: 3355ff7790 am: 92e9e5d1ad am: f74c9a8a5b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I090449d360264c4388c4ef4cae7f6b0a90d90053

commit | commitdiff | tree

Yifan Hong [Wed, 20 Jan 2021 20:49:05 +0000 (20:49 +0000)]

Refactor HIDL HAL Dev GC invocation am: 8f0d45441c am: b586527450 am: c4f67a28f3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70a8269151232c2faf07b5c06598bad5e7e79108

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 20 Jan 2021 11:53:04 +0000 (11:53 +0000)]

Merge "Revert^4 "Customize StubVolume implementation for ARC"" am: 69c97b6d12 am: 500bfa9d4a am: edbb8c3ba4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bd81b674299441369f4e4f0698cf6e528a2c7c0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 20 Jan 2021 10:33:52 +0000 (10:33 +0000)]

Merge "Revert^4 "Customize StubVolume implementation for ARC""

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Tue, 19 Jan 2021 22:42:33 +0000 (22:42 +0000)]

Merge "Revert "Revert "Revert "Customize StubVolume implementation for ARC"""" am: 922af320dd am: 4e77967775 am: c2a372231f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80daa969ade20d4372ca96b3d2cee95cb9831bb8

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Maurice Lam [Tue, 19 Jan 2021 19:28:36 +0000 (19:28 +0000)]

Merge "Revert "Revert "Revert "Customize StubVolume implementation for ARC""""

commit | commitdiff | tree

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

commit | commitdiff | tree

Yurii Zubrytskyi [Tue, 8 Dec 2020 15:33:37 +0000 (07:33 -0800)]

IncFS: pass over the new .blocks_written IncFS control file

Bug: 170231230
Test: incremental and PackageManager unit tests
Ignore-AOSP-First: new IncFS API is an internal-first topic
Change-Id: I7fccaf367d4b98294e2e6da4460792514147d954

commit | commitdiff | tree

rickywai [Tue, 19 Jan 2021 17:27:31 +0000 (17:27 +0000)]

Merge "Call setupAppDir before EnsureDirExists" am: d4de02ed14 am: f44cf21080 am: f1f587f28a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc67fc45df3a5c9ec8946739531d51462736967f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

rickywai [Tue, 19 Jan 2021 15:24:02 +0000 (15:24 +0000)]

Merge "Call setupAppDir before EnsureDirExists"

commit | commitdiff | tree

Risan [Tue, 19 Jan 2021 13:20:46 +0000 (13:20 +0000)]

Merge "Revert "Revert "Customize StubVolume implementation for ARC""" am: a8ebbe77a0 am: 1932006a8f am: 3b4adee2f0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c90b9214791ea11ddbff03f8e147791a10d0a1d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Martijn Coenen [Tue, 19 Jan 2021 11:20:25 +0000 (11:20 +0000)]

Merge "Set a default ACL on /data/media/userId." am: 14782046f3 am: 90795b62da am: 6174c4e5d8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37aaaafaea54fc29e7f5af924a2ea6c718ce9525

commit | commitdiff | tree

Risan [Tue, 19 Jan 2021 11:20:08 +0000 (11:20 +0000)]

Merge "Revert "Revert "Customize StubVolume implementation for ARC"""

system/vold

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.