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

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

Yo Chiang [Mon, 26 Oct 2020 06:20:25 +0000 (06:20 +0000)]

Merge "Add IVold::destroyDsuMetadataKey()" am: cb581cc8de am: 3ae0c6737c

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

Change-Id: I7cb2b806de2f70e6ce569001d79f07a4ce6c8556

commit | commitdiff | tree

Yo Chiang [Mon, 26 Oct 2020 05:49:35 +0000 (05:49 +0000)]

Merge "Add IVold::destroyDsuMetadataKey()" am: cb581cc8de

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

Change-Id: I6241d71e331eebe0222696a052e40d2222a9c537

commit | commitdiff | tree

Yo Chiang [Mon, 26 Oct 2020 05:27:36 +0000 (05:27 +0000)]

Merge "Add IVold::destroyDsuMetadataKey()"

commit | commitdiff | tree

Treehugger Robot [Thu, 22 Oct 2020 00:32:21 +0000 (00:32 +0000)]

Merge "Set media folder +F for adopted storage as well" am: 739ca2c298 am: 19adff5f27

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

Change-Id: I855399600230f5a27d8058ec7fee0df9b2d22f22

commit | commitdiff | tree

Treehugger Robot [Wed, 21 Oct 2020 23:12:51 +0000 (23:12 +0000)]

Merge "Set media folder +F for adopted storage as well" am: 739ca2c298

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

Change-Id: I90d0e56e260094661217dd20135f9fde6da96e98

commit | commitdiff | tree

Treehugger Robot [Wed, 21 Oct 2020 22:04:11 +0000 (22:04 +0000)]

Merge "Set media folder +F for adopted storage as well"

commit | commitdiff | tree

Daniel Rosenberg [Thu, 13 Aug 2020 01:31:43 +0000 (18:31 -0700)]

Set media folder +F for adopted storage as well

We previously only set +F for /data/media, but adopted storage needs
this as well. Instead we add support for adding attrs to PrepareDir.

Bug: 163453310
Test: sm set-virtual-disk true
follow UI setup and confirm +F on /mnt/expand/*/media
Change-Id: I08f13b57a4de3538e88b38eb95b0ac115a5a5ce8
Merged-In: I08f13b57a4de3538e88b38eb95b0ac115a5a5ce8

commit | commitdiff | tree

Eric Biggers [Wed, 21 Oct 2020 00:02:21 +0000 (00:02 +0000)]

Merge "vold: Generate storage key without rollback resistance" am: 4f5e9c196f am: b6d1a31949

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

Change-Id: Iaab2239444df05a089224bd145fe6d9c4baee436

commit | commitdiff | tree

Eric Biggers [Tue, 20 Oct 2020 23:45:41 +0000 (23:45 +0000)]

Merge "vold: Generate storage key without rollback resistance" am: 4f5e9c196f

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

Change-Id: Ibf06476010946d799c4b1fa5143ed4eac96f301a

commit | commitdiff | tree

Eric Biggers [Tue, 20 Oct 2020 23:17:22 +0000 (23:17 +0000)]

Merge "vold: Generate storage key without rollback resistance"

commit | commitdiff | tree

Gaurav Kashyap [Fri, 11 Sep 2020 22:24:01 +0000 (15:24 -0700)]

vold: Generate storage key without rollback resistance

Generate a storage key without rollback_resistance when device doesnt
support the corresponding tag.

Bug: 168527558

Change-Id: Iaf27c64dba627a31c9cbd9178458bf6785d00251

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 17:30:11 +0000 (17:30 +0000)]

Merge changes Idc575106,Id6457a2b am: 3e0e53dbe5 am: 8671044a64

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

Change-Id: I9c673f9b4bf31b88c8ffa74e6f32f8eb4d2f9045

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 17:30:00 +0000 (17:30 +0000)]

Merge "MetadataCrypt: remove unnecessary retry loop" am: 80fdc5a4e3 am: 5a1e03f705

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

Change-Id: I5211d2aba15fcd8e201862428f79eb282ecff889

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 17:28:34 +0000 (17:28 +0000)]

Merge "Silence useless LOOP_GET_STATUS64 warnings" am: 6f70c92aee am: 4d0d21e69d

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

Change-Id: Iacf84a01d4937c62befac52cd1f0eb6ab6104663

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 16:26:21 +0000 (16:26 +0000)]

Merge changes Idc575106,Id6457a2b am: 3e0e53dbe5

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

Change-Id: If01239e184cd19de660fa158d599c9826ea0cf71

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 16:26:15 +0000 (16:26 +0000)]

Merge "MetadataCrypt: remove unnecessary retry loop" am: 80fdc5a4e3

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

Change-Id: Id26dbda854480c74d07fcec87f1d045325bf625a

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 16:26:06 +0000 (16:26 +0000)]

Merge "Silence useless LOOP_GET_STATUS64 warnings" am: 6f70c92aee

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

Change-Id: I75d169008b857848c314598cac4d87f27d6919b1

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 16:08:02 +0000 (16:08 +0000)]

Merge changes Idc575106,Id6457a2b

* changes:
IdleMaint: skip swap space, bind mounts, and virtual filesystems
IdleMaint: use fstab_default from VoldUtil

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 16:05:53 +0000 (16:05 +0000)]

Merge "MetadataCrypt: remove unnecessary retry loop"

commit | commitdiff | tree

Eric Biggers [Mon, 19 Oct 2020 16:05:17 +0000 (16:05 +0000)]

Merge "Silence useless LOOP_GET_STATUS64 warnings"

commit | commitdiff | tree

Eric Biggers [Thu, 15 Oct 2020 23:54:38 +0000 (16:54 -0700)]

IdleMaint: skip swap space, bind mounts, and virtual filesystems

When the idle maintenance task runs on Cuttlefish, there are several
warnings printed to logcat after the expected messages:

    D vold    : Starting trim of /data
    I vold    : Trimmed 0 bytes on /data in 36ms
    D vold    : Starting trim of /cache
    I vold    : Trimmed 58662912 bytes on /cache in 0ms
    D vold    : Starting trim of /metadata
    I vold    : Trimmed 7725056 bytes on /metadata in 12ms
    D vold    : Starting trim of none
    W vold    : Failed to open none: No such file or directory
    D vold    : Starting trim of /sdcard
    W vold    : Failed to open /sdcard: Not a directory
    D vold    : Starting trim of /mnt/vendor/shared
    W vold    : Trim failed on /mnt/vendor/shared: Inappropriate ioctl for device

This is because vold gathers the filesystems to trim from the fstab, but
it fails to exclude some entries that aren't appropriate to trim:

    /dev/block/zram0 none swap defaults zramsize=75%
    /tmp /sdcard none defaults,bind recoveryonly
    shared /mnt/vendor/shared virtiofs nosuid,nodev,noatime nofail

These should be excluded because they are swap space, a bind mount, and
a virtual filesystem respectively.

Fix addFromFstab() to exclude the above cases.

Afterwards, the messages on Cuttlefish are:

    D vold    : Starting trim of /data
    I vold    : Trimmed 0 bytes on /data in 39ms
    D vold    : Starting trim of /cache
    I vold    : Trimmed 58662912 bytes on /cache in 0ms
    D vold    : Starting trim of /metadata
    I vold    : Trimmed 9822208 bytes on /metadata in 12ms

Change-Id: Idc575106fe6f81c737f684429d58dba4bd5478ad

commit | commitdiff | tree

Eric Biggers [Thu, 15 Oct 2020 23:54:38 +0000 (16:54 -0700)]

IdleMaint: use fstab_default from VoldUtil

vold already reads the default fstab into memory when starting up, and
the default fstab isn't allowed to change later. So in IdleMaint.cpp,
just use 'fstab_default' instead of reading it again.

This also has the advantage that fstab entries for "logical partitions"
now get a properly updated blk_device, which is needed in order to start
using blk_device to exclude virtual filesystems in addFromFstab().

Change-Id: Id6457a2b7972d01dde4bca0c5f2da86374d930af

commit | commitdiff | tree

Eric Biggers [Thu, 15 Oct 2020 21:52:54 +0000 (14:52 -0700)]

Silence useless LOOP_GET_STATUS64 warnings

When vold starts up, there are lots of warnings like:

    W vold    : Failed to LOOP_GET_STATUS64 /dev/block/loop30: No such device or address
    W vold    : Failed to LOOP_GET_STATUS64 /dev/block/loop29: No such device or address
    W vold    : Failed to LOOP_GET_STATUS64 /dev/block/loop28: No such device or address

vold is iterating through all loop devices and unbinding the file from
any vold-managed ones.

It's expected that not all loop devices have a file bound to them,
however.  On these, LOOP_GET_STATUS64 fails with ENXIO.

Don't print a warning in such cases.

Change-Id: I91755259dc2c09b1869627259d1e59d5edd6f145

commit | commitdiff | tree

Eric Biggers [Thu, 15 Oct 2020 21:39:34 +0000 (14:39 -0700)]

MetadataCrypt: remove unnecessary retry loop

As per the discussion at http://aosp/1456266, the retry loop in
create_crypto_blk_dev() doesn't appear to be needed. Remove it.

For now don't bother removing the same retry loop in cryptfs.cpp, since
the FDE code isn't really being updated anymore and eventually will be
removed entirely.

Change-Id: Iba0b046f9cdd9723ea1a2ae70f4d4aed4355b97b

commit | commitdiff | tree

Yo Chiang [Wed, 7 Oct 2020 06:20:00 +0000 (14:20 +0800)]

Add IVold::destroyDsuMetadataKey()

destroyDsuMetadataKey() / destroy_dsu_metadata_key() calls
android::gsi::GetDsuMetadataKeyDir() to query the DSU metadata
encryption key dir and destroy the key.
This releases the resource and allows consecutive DSU installations to
use the same key *directory*, but not the same key *blob*.

Bug: 168571434
Test: 1. Install a DSU system.
  2. Boot the DSU system and reboot back to the host system.
  3. Wipe the DSU installation.
  4. DSU metadata key dir /metadata/vold/metadata_encryption/dsu/dsu is
     destroyed.
Change-Id: Ib851177315a5a266807f46ccfd446de1848232cf

commit | commitdiff | tree

Martijn Coenen [Mon, 12 Oct 2020 19:04:22 +0000 (19:04 +0000)]

Merge "Use dm.CreateDevice() with a timeout." am: e9023dc7bb am: 7da18c97ef

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

Change-Id: If3c48689e76062c7819bba9a8ac43c2e14e4d189

commit | commitdiff | tree

Martijn Coenen [Mon, 12 Oct 2020 18:46:02 +0000 (18:46 +0000)]

Merge "Use dm.CreateDevice() with a timeout." am: e9023dc7bb

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

Change-Id: Id232a623d6aa3beaa3fdb5b31c722e96da6d75c9

commit | commitdiff | tree

Martijn Coenen [Mon, 12 Oct 2020 18:07:39 +0000 (18:07 +0000)]

Merge "Use dm.CreateDevice() with a timeout."

commit | commitdiff | tree

Martijn Coenen [Mon, 12 Oct 2020 11:26:52 +0000 (13:26 +0200)]

Use dm.CreateDevice() with a timeout.

Using the regular CreateDevice() variant with getDmDeviceByName() has a
race-condition that is documented in libdm/dm.h; instead, use the
variant with a timeout, which guarantees that the block device exists
when it returns.

Test: atest AdoptableHostTest
Bug: 150935323
Change-Id: Ic06cad9af7c44e23359d95b262f68dba27ddfb3a

commit | commitdiff | tree

Xin Li [Fri, 9 Oct 2020 03:39:50 +0000 (03:39 +0000)]

[automerger skipped] Skip ab/6749736 in stage. am: fd4abc5e72 -s ours

am skip reason: Change-Id I876aaf6bba933c964a3573d8053cc60829b3a5fa with SHA-1 e9317d2d74 is in history

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

Change-Id: I5f4fa754fe9a8963880bfaf851aff7eb30dad4cb

commit | commitdiff | tree

Xin Li [Fri, 9 Oct 2020 00:24:08 +0000 (17:24 -0700)]

Skip ab/6749736 in stage.

Merged-In: I876aaf6bba933c964a3573d8053cc60829b3a5fa
Change-Id: I4c8616d3c17e3b9818bde3299fcc79f5444a95f5

commit | commitdiff | tree

Alan Stokes [Mon, 5 Oct 2020 09:32:58 +0000 (09:32 +0000)]

Merge "Enable vold to set level from user." am: dd66de13ea am: cfc66f28b1 am: 77894409cf

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

Change-Id: I6dbacaf42ed2651f2f65ceb2a011eed08987d644

commit | commitdiff | tree

Alan Stokes [Mon, 5 Oct 2020 08:57:55 +0000 (08:57 +0000)]

Merge "Enable vold to set level from user." am: dd66de13ea am: cfc66f28b1

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

Change-Id: I63fa1f6301d457540c5243ba621d2efcacc9641f

commit | commitdiff | tree

Alan Stokes [Mon, 5 Oct 2020 08:38:49 +0000 (08:38 +0000)]

Merge "Enable vold to set level from user." am: dd66de13ea

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

Change-Id: I4e09204e7b0e2a0c3028ba38238bf65636144ad2

commit | commitdiff | tree

Alan Stokes [Mon, 5 Oct 2020 08:23:08 +0000 (08:23 +0000)]

Merge "Enable vold to set level from user."

commit | commitdiff | tree

Alan Stokes [Fri, 7 Feb 2020 09:29:38 +0000 (09:29 +0000)]

Enable vold to set level from user.

We want various per-user directories to have their SELinux MLS level
set to restrict access from other users, as an improvement to user
isolation.

We extend vold_prepare_subdirs to implement this if a flag is
set. vold itself then sets the flag based on a new property,
ro.vold.level_from_user. This is to allow testing of further
incremental work to ensure system apps correctly handle the new
restriction on different devices rather than causing immediate
breakage. Eventually this will go away and the restriction will apply
everywhere.

Bug: 141677108
Test: Manual, with and without propery set.
Change-Id: I8e2207bd94b487bdcc09fd4d80b031027dfea1e3

commit | commitdiff | tree

Treehugger Robot [Thu, 24 Sep 2020 17:22:32 +0000 (17:22 +0000)]

Merge "vold: remove unused stop() methods" am: d70e2b4ea9 am: 27a747b8ab am: 406cabf717

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

Change-Id: Ibb68550d81667178461c4ac990228fcb02a2a8a4

commit | commitdiff | tree

Treehugger Robot [Thu, 24 Sep 2020 16:54:24 +0000 (16:54 +0000)]

Merge "vold: remove unused stop() methods" am: d70e2b4ea9 am: 27a747b8ab

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

Change-Id: I41c720b7260e7fa2b4d0c460df630c7fce8bd135

commit | commitdiff | tree

Treehugger Robot [Thu, 24 Sep 2020 16:25:43 +0000 (16:25 +0000)]

Merge "vold: remove unused stop() methods" am: d70e2b4ea9

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

Change-Id: Ifb529e76791d98c76c549bfb93c5abcf4096e685

commit | commitdiff | tree

Treehugger Robot [Thu, 24 Sep 2020 16:06:58 +0000 (16:06 +0000)]

Merge "vold: remove unused stop() methods"

commit | commitdiff | tree

Eric Biggers [Wed, 23 Sep 2020 17:00:40 +0000 (10:00 -0700)]

vold: remove unused stop() methods

NetlinkManager::stop() and VolumeManager::stop() are never called, so
remove them.

Change-Id: I868aa2ad24066d2830816984afcc10000cbabad1

commit | commitdiff | tree

Treehugger Robot [Mon, 21 Sep 2020 11:17:39 +0000 (11:17 +0000)]

Merge "bench: Add fail-fast error path to inodeop_bench" am: 5a99d3cfbb am: 2cfe561129 am: c0eded67a6

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

Change-Id: Ic736a201f65a83ce82495177e26313d44bce15c8

commit | commitdiff | tree

Treehugger Robot [Mon, 21 Sep 2020 10:26:38 +0000 (10:26 +0000)]

Merge "bench: Add fail-fast error path to inodeop_bench" am: 5a99d3cfbb am: 2cfe561129

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

Change-Id: I6ec04c8a1f8f4e1c6a6a96fb7e7b38813a0add3b

commit | commitdiff | tree

Treehugger Robot [Mon, 21 Sep 2020 10:07:55 +0000 (10:07 +0000)]

Merge "bench: Add fail-fast error path to inodeop_bench" am: 5a99d3cfbb

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

Change-Id: I6bd94ca9e8ec62660b716d319ae949cdc578f6a3

commit | commitdiff | tree

Treehugger Robot [Mon, 21 Sep 2020 09:44:03 +0000 (09:44 +0000)]

Merge "bench: Add fail-fast error path to inodeop_bench"

commit | commitdiff | tree

Stefano Duo [Fri, 18 Sep 2020 09:00:42 +0000 (09:00 +0000)]

bench: Add fail-fast error path to inodeop_bench

If one of the repeated operations specified by a command fails, report
the error to the user and don't export its metric.

Test: Manual run on physical device
Bug: 165903680
Signed-off-by: Stefano Duo <stefanoduo@google.com>
Change-Id: I3a8caeb6d878b004d89e425bc166c8505fda938a

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 03:14:02 +0000 (03:14 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e am: 48b6b1c767

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

Change-Id: I8704dc372c1deebd87f2e5e52c781fbe3f46978b

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 02:26:57 +0000 (02:26 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e

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

Change-Id: I65c09190aa8f6e61bda750980bfdcc06e0306d4b

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 02:04:55 +0000 (02:04 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70

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

Change-Id: I0254ee7e493f98a78476f2e939884185b04d10c0

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Sep 2020 01:24:16 +0000 (01:24 +0000)]

Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION"

commit | commitdiff | tree

Eric Biggers [Tue, 15 Sep 2020 18:55:40 +0000 (11:55 -0700)]

vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION

Nothing defines CONFIG_HW_DISK_ENCRYPTION, so remove the unused code
that's conditional on it being defined.

Change-Id: Ie435e138686eb4eac47d9aa762ae06f1645a117f

commit | commitdiff | tree

Daeho Jeong [Tue, 15 Sep 2020 01:13:08 +0000 (01:13 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6 am: 79dfe789d9

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

Change-Id: Ie7763c4b57b5e4d78eb5e5e8f31a7dd78f550aae

commit | commitdiff | tree

Daeho Jeong [Tue, 15 Sep 2020 00:45:22 +0000 (00:45 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01 am: 58383d92c6

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

Change-Id: I51b4ca860a8222a2a978ea96cbd68d53262ac2e3

commit | commitdiff | tree

Daeho Jeong [Tue, 15 Sep 2020 00:13:38 +0000 (00:13 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01

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

Change-Id: I84cf17d8dd07c72a67beba46a814f51969a159ac

commit | commitdiff | tree

Daeho Jeong [Mon, 14 Sep 2020 23:50:17 +0000 (23:50 +0000)]

Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard"

commit | commitdiff | tree

Daeho Jeong [Tue, 8 Sep 2020 03:59:28 +0000 (12:59 +0900)]

secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard

A new interface, F2FS_IOC_SEC_TRIM_FILE, has been added to F2FS
filesystem to send secure discard command to a specific file,
not to block device. We can use this interface for better discard
command handling on a file basis.

[how to use F2FS_IOC_SEC_TRIM_FILE]
start: start offset in byte (should be aligned with 4096)
len: length in byte (should be aligned with 4096, except designating EOF)
     -1 also means till EOF.
flags: F2FS_TRIM_FILE_DISCARD - sending secure discard command. If the
                                device doesn't support it, send normal
                                discard.
       F2FS_TRIM_FILE_ZEROOUT - overwrite zero data in the file.

Bug: 140759142
Test: execute "secdiscard -- <file_path>" and check the content of file
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I6ee44a047d291274c9d70ae5e4ccccfc06a52f89

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 10:14:30 +0000 (10:14 +0000)]

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours am: 95177aab00 -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

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

Change-Id: If5b9d639b35b8c3017fb3b3dc316fb648951a737

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 09:29:33 +0000 (09:29 +0000)]

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

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

Change-Id: Iba1f2ef22059f905091e742f8041e675a6f76d77

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 08:40:46 +0000 (08:40 +0000)]

Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1

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

Change-Id: I44aea35571e4dff7f9f1010325f51d0e98dc01f1

commit | commitdiff | tree

Treehugger Robot [Fri, 11 Sep 2020 08:19:44 +0000 (08:19 +0000)]

Merge "Add '-unstable' to solve ODR violation"

commit | commitdiff | tree

Jeongik Cha [Fri, 14 Aug 2020 14:51:36 +0000 (23:51 +0900)]

Add '-unstable' to solve ODR violation

The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem

Bug: 146436251
Test: m nothing
Change-Id: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
Merged-In: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424
Exempt-From-Owner-Approval: cp from internal

commit | commitdiff | tree

Xin Li [Fri, 11 Sep 2020 03:33:34 +0000 (03:33 +0000)]

[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours am: 789d1d0866 -s ours am: a56f7d2608 -s ours

am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history

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

Change-Id: Ib0d73f9b471d4cb9834da5c25aaeae2a53ade075

commit | commitdiff | tree

Xin Li [Fri, 11 Sep 2020 02:02:43 +0000 (02:02 +0000)]

[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours am: 789d1d0866 -s ours

am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history

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

Change-Id: Ic319ade87dab6280b771d6f8d91d7bfde3a056fe

commit | commitdiff | tree

Xin Li [Fri, 11 Sep 2020 00:40:18 +0000 (00:40 +0000)]

[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s ours

am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history

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

Change-Id: I78dff452b759e863b082f44b76fb5ae9a83cb704

commit | commitdiff | tree

Xin Li [Thu, 10 Sep 2020 17:22:31 +0000 (17:22 +0000)]

Merge "Merge Android R"

commit | commitdiff | tree

Xin Li [Thu, 10 Sep 2020 03:21:28 +0000 (20:21 -0700)]

Merge Android R

Bug: 168057903
Merged-In: I477d2dfba05718c829fdb2099248a8baba1125ab
Change-Id: Ib60b99425dc79ca4c5b23772f32036f4e17ad11f

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 14:17:24 +0000 (14:17 +0000)]

Merge "bench: Add inodeop_bench benchmark" am: e804806d79 am: 8743ef4ea6 am: 6bc12b0352

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

Change-Id: I4207b03f8683cc3e8f0e9419f2102332d9fd36d9

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 13:50:13 +0000 (13:50 +0000)]

Merge "bench: Add inodeop_bench benchmark" am: e804806d79 am: 8743ef4ea6

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

Change-Id: I1071fd34394aefcc2fc2e5bfd29e97df6dc28072

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 13:34:41 +0000 (13:34 +0000)]

Merge "bench: Add inodeop_bench benchmark" am: e804806d79

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

Change-Id: I477d2dfba05718c829fdb2099248a8baba1125ab

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Sep 2020 13:03:12 +0000 (13:03 +0000)]

Merge "bench: Add inodeop_bench benchmark"

commit | commitdiff | tree

Stefano Duo [Mon, 7 Sep 2020 16:30:49 +0000 (16:30 +0000)]

bench: Add inodeop_bench benchmark

Add new benchmark capable of generating specific inode operations
workloads. Currently, it supports create, delete, move, hardlink and
symlink.

Test: Manual run on cuttlefish and physical device
Bug: 165903680
Signed-off-by: Stefano Duo <stefanoduo@google.com>
Change-Id: Ia47f259b7ccea5fe1665b272c3cbc9ec1bf2eb56

commit | commitdiff | tree

Xin Li [Tue, 1 Sep 2020 21:46:46 +0000 (21:46 +0000)]

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734 -s ours am: f13d17f2b8 -s ours

am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61 is in history

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

Change-Id: I81c76af55e45dde815acb9138570e6ca627597a3

commit | commitdiff | tree

Xin Li [Tue, 1 Sep 2020 20:37:11 +0000 (20:37 +0000)]

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734 -s ours

am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61 is in history

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

Change-Id: Id0bdc9b0190233ed0384b52a5844597b337833e1

commit | commitdiff | tree

Jeongik Cha [Fri, 28 Aug 2020 01:49:42 +0000 (01:49 +0000)]

Add '-unstable' to solve ODR violation am: 44b2f954be

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

Change-Id: I9f3d00625a59390efdb926cde389729a71be7fa7

commit | commitdiff | tree

Xin Li [Thu, 27 Aug 2020 17:17:42 +0000 (10:17 -0700)]

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: Id417587a550b0f4abf5a6a3e4b4535011b21f627
Change-Id: Ibb5e8cf5f36dad408cf047dd0498aba24249b695

commit | commitdiff | tree

Jeongik Cha [Fri, 14 Aug 2020 14:51:36 +0000 (23:51 +0900)]

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 11:28:19 +0000 (11:28 +0000)]

Merge "Add maco@ to vold OWNERS." am: 157a08bb92 am: 3d1b6ac7c0 am: abd6f5a165

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

Change-Id: I857784ab0f24771c96ad0ecf48ddec659c650f9c

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 11:13:35 +0000 (11:13 +0000)]

Merge "Add maco@ to vold OWNERS." am: 157a08bb92 am: 3d1b6ac7c0

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

Change-Id: I02184aa11a783fb3201812d2a8f64faca981cbc2

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 10:56:15 +0000 (10:56 +0000)]

Merge "Add maco@ to vold OWNERS." am: 157a08bb92

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

Change-Id: I0d0a8048465e190105f03dfe76fbf5c8393a4198

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 10:34:17 +0000 (10:34 +0000)]

Merge "Add maco@ to vold OWNERS."

commit | commitdiff | tree

Martijn Coenen [Tue, 11 Aug 2020 07:13:27 +0000 (09:13 +0200)]

Add maco@ to vold OWNERS.

Bug: N/A
Test: N/A
Change-Id: Ib00991eccbd33e719a64d55da932f7f2bfab7b71

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 23:25:45 +0000 (23:25 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6 am: 124f3575be

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

Change-Id: I09a23c705c2fe0bc01c321f38c3eadb7bd1e44da

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 23:10:18 +0000 (23:10 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6

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

Change-Id: I14257e5e427795e8871de5df94696e49766566a6

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 22:53:51 +0000 (22:53 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129

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

Change-Id: Iacb41f3dba6c2a57943f766b749d87efe6f4e4b3

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 22:35:21 +0000 (22:35 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level"

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:46:37 +0000 (18:46 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1 am: 5acfc3e8d5 am: d1a7e750e2

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

Change-Id: Ib38c9b7459b1dcd4c8b00334bcf4375d81d590fe

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 17:55:56 +0000 (10:55 -0700)]

vold: use __ANDROID_API_Q__ instead of pre_gki_level

The name "pre_gki_level" is causing some confusion because not all
devices launching with Android R are subject to the GKI requirement.
(See b/161563110#comment11.) E.g., devices that use a 4.14-based kernel
are exempt from GKI. However, the encryption requirements still apply.

Just use __ANDROID_API_Q__ directly instead.

No change in behavior.

Change-Id: Id02ae1140845ac1ae7cf78be4e57fe34da028abf

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:22:03 +0000 (18:22 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1 am: 5acfc3e8d5

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

Change-Id: I28615b8a9a656804b8ebacff0876e2acb1a64c1f

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:04:57 +0000 (18:04 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1

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

Change-Id: I29e6eab9571d4556883594049f4abc33d9ffa674

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 17:52:39 +0000 (17:52 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted"

commit | commitdiff | tree

Will Shiu [Wed, 29 Jul 2020 09:03:17 +0000 (17:03 +0800)]

EncryptInPlace: ensure that backup superblocks get encrypted

Block groups with EXT4_BG_BLOCK_UNINIT still have backup superblocks
(and backup block group descriptors). Fix EncryptInPlace to encrypt
these backup superblocks rather than leave them unencrypted.

Previously leaving the backup superblocks unencrypted didn't cause any
problems, but due to system/core commit 72abd7b246f7 ("Try to recover
corrupted ext4 /data with backup superblock") it is causing problems.

Bug: 162479411
Bug: 161871210
Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 19:20:28 +0000 (19:20 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591 am: dd8b695c61

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

Change-Id: I876aaf6bba933c964a3573d8053cc60829b3a5fa

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 19:02:45 +0000 (19:02 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591

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

Change-Id: Id417587a550b0f4abf5a6a3e4b4535011b21f627

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 18:38:05 +0000 (18:38 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b

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

Change-Id: Ibb6947f1fad7a31cf2a42c3604c76fcf45a7082a

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 18:24:51 +0000 (18:24 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__"

commit | commitdiff | tree

Mark Salyzyn [Fri, 17 Jul 2020 15:17:50 +0000 (08:17 -0700)]

vold: restore -D__ANDROID_DEBUGGABLE__

Regression introduced by
commit 7ebcc2bcfde2cf6713e2975224034b06ba0943d8
("Revert "[Vold] Conditional dependency to ARC++ ObbVolume"")
errantly removed the product_variables support for
-D__ANDROID_DEBUGGABLE__ when built for userdebug builds.

Restore stanza.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 161454607
Test: adb-remount-test no longer reports a problem
Change-Id: Ia7e55d1174fa7fac2d934d4aac06d15e8be388af

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:03:01 +0000 (02:03 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900 am: d0b2751e8f

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

Change-Id: Id61233aba34e8c67a2ab3860c4259eaeaefdab15

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:02:39 +0000 (02:02 +0000)]

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03 am: 6b36554b38

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

Change-Id: I18cbddc92985f88d95dca71b05b9d07919134af9

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:50:24 +0000 (01:50 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900

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

Change-Id: Ia7fca6e61c58317002271c8338bb01a12e8223a5

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:50:07 +0000 (01:50 +0000)]

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03

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

Change-Id: Iffa50e4c549469de6425134369e609856f1d7813

system/vold

RSS Atom

About OSDN

Find Software

Develop Software

Help