OSDN Git Service
Eric Biggers [Thu, 5 Nov 2020 20:15:46 +0000 (20:15 +0000)]
Merge "EncryptInplace: fsync cryptofd before reporting success" am:
e244a15f34 am:
22f226245a am:
420868767f am:
c1c68dede3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1488376
Change-Id: I51f8457fc5f2ddbf2c02c48237dc4b4efc85d74a
Eric Biggers [Thu, 5 Nov 2020 19:50:13 +0000 (19:50 +0000)]
Merge "EncryptInplace: fsync cryptofd before reporting success" am:
e244a15f34 am:
22f226245a am:
420868767f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1488376
Change-Id: If74875c79d3f4c68895d35f2138e42ec9f355afc
Eric Biggers [Thu, 5 Nov 2020 19:23:28 +0000 (19:23 +0000)]
Merge "EncryptInplace: fsync cryptofd before reporting success" am:
e244a15f34 am:
22f226245a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1488376
Change-Id: I8e7152cce18b1ed8b5f1265c08e2abb403deef9c
Eric Biggers [Thu, 5 Nov 2020 19:09:37 +0000 (19:09 +0000)]
Merge "EncryptInplace: fsync cryptofd before reporting success" am:
e244a15f34
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1488376
Change-Id: I10ff2f5cccf00fbd3cbac93059ce7f069911e9c4
Eric Biggers [Thu, 5 Nov 2020 18:51:13 +0000 (18:51 +0000)]
Merge "EncryptInplace: fsync cryptofd before reporting success"
Eric Biggers [Thu, 5 Nov 2020 18:30:24 +0000 (18:30 +0000)]
[automerger skipped] KeyUtil: don't use keepOld=true for system DE and volume keys am:
2c9d6d6675 -s ours am:
e4bf57a6d3 -s ours
am skip reason: Change-Id I42d3f5fbe32cb2ec229f4b614cfb271412a3ed29 with SHA-1
c493903732 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/
12971598
Change-Id: Id0992059969480e9e15d14c77fc04f1d55c9cfc8
Eric Biggers [Thu, 5 Nov 2020 17:50:20 +0000 (17:50 +0000)]
[automerger skipped] KeyUtil: don't use keepOld=true for system DE and volume keys am:
2c9d6d6675 -s ours
am skip reason: Change-Id I42d3f5fbe32cb2ec229f4b614cfb271412a3ed29 with SHA-1
c493903732 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/
12971598
Change-Id: Ieb69946c8c2a6640b7af58561d872b50022d4f5b
Eric Biggers [Thu, 5 Nov 2020 02:38:38 +0000 (18:38 -0800)]
EncryptInplace: fsync cryptofd before reporting success
fsync() the cryptofd when done writing to it. Without this, any
remaining dirty pages in the crypto_blkdev's page cache (which there
might be a lot of, even as much as all the data that was written) won't
be flushed to disk until the cryptofd is closed, which ignores I/O
errors and is also after we already reported 100% completion.
There wasn't an fsync() in the original version either, so we've been
getting by without it, but it seems it should be there.
Change-Id: Idd1be3ae67ce96ecf3946b9efb9fc57414f5805a
Eric Biggers [Wed, 4 Nov 2020 20:39:31 +0000 (20:39 +0000)]
Merge changes from topic "encryptinplace-cleanup" am:
91e4f1dd76 am:
ee175c954a am:
992e8dfdaa am:
0b705b5167
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1467990
Change-Id: Ifbcf5c10ab81955720e7c0209d9c59a2a54aae0a
Eric Biggers [Wed, 4 Nov 2020 20:23:01 +0000 (20:23 +0000)]
Merge changes from topic "encryptinplace-cleanup" am:
91e4f1dd76 am:
ee175c954a am:
992e8dfdaa
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1467990
Change-Id: Ic3f7333839a1aceffff621ec8f592b744778cdef
Eric Biggers [Wed, 4 Nov 2020 19:53:11 +0000 (19:53 +0000)]
Merge changes from topic "encryptinplace-cleanup" am:
91e4f1dd76 am:
ee175c954a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1467990
Change-Id: If0f5196b66387b3a195b10c1b48d030f7bb8eb5a
Eric Biggers [Wed, 4 Nov 2020 19:15:05 +0000 (19:15 +0000)]
Merge changes from topic "encryptinplace-cleanup" am:
91e4f1dd76
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1467990
Change-Id: I50e47bd1cb102b9013542b0676258a79ac44b6b1
Eric Biggers [Wed, 4 Nov 2020 18:47:05 +0000 (18:47 +0000)]
Merge changes from topic "encryptinplace-cleanup"
* changes:
Refactor EncryptInplace.cpp
Correctly calculate tot_used_blocks on ext4 with uninit_bg
Fix memory leak of f2fs_info
Remove special handling for missing crypto_blkdev
Check return value of create_crypto_blk_dev()
Remove unused support for partial encryption
Eric Biggers [Tue, 3 Nov 2020 22:11:02 +0000 (14:11 -0800)]
Refactor EncryptInplace.cpp
Refactor EncryptInplace.cpp to simplify and improve it a lot. This is
everything that didn't fit into prior commits, including:
- Share a lot more code between ext4, f2fs, and full encryption.
- Improve the log messages. Most importantly, don't spam the log with
huge numbers of messages, and don't log errors in expected cases.
Note: generate_f2fs_info() is still too noisy, but that's part of
"system/extras", not vold, so this change doesn't change that.
- When possible, do 32K reads/writes for f2fs and for full encryption,
not just for ext4. This might improve performance.
- Take advantage of C++ functionality.
- Be more careful about edge cases. E.g. if the calculation of the
number of blocks to encrypt was wrong, don't set vold.encrypt_progress
to > 99 until we're actually done.
The net change is over 200 lines removed.
Before-after comparison of log when enabling metadata encryption:
ext4 before:
I vold : Beginning inplace encryption, nr_sec:
16777216
D vold : cryptfs_enable_inplace(/dev/block/dm-8, /dev/block/by-name/userdata,
16777216, 0)
D vold : Opening/dev/block/by-name/userdata
D vold : Opening/dev/block/dm-8
I vold : Encrypting ext4 filesystem in place...
[omitted 6387 log messages]
I vold : Encrypted to sector
822084608
D vold : cryptfs_enable_inplace_ext4 success
I vold : Inplace encryption complete
ext4 after:
D vold : encrypt_inplace(/dev/block/dm-8, /dev/block/by-name/userdata,
16777216, false)
D vold : ext4 filesystem has 64 block groups
I vold : Encrypting ext4 filesystem on /dev/block/by-name/userdata in-place via /dev/block/dm-8
I vold : 50327 blocks (206 MB) of
2097152 blocks are in-use
D vold : Encrypted 10000 of 50327 blocks
D vold : Encrypted 20000 of 50327 blocks
D vold : Encrypted 30000 of 50327 blocks
D vold : Encrypted 40000 of 50327 blocks
D vold : Encrypted 50000 of 50327 blocks
D vold : Encrypted 50327 of 50327 blocks
I vold : Successfully encrypted ext4 filesystem on /dev/block/by-name/userdata
f2fs before:
I vold : Beginning inplace encryption, nr_sec:
16777216
D vold : cryptfs_enable_inplace(/dev/block/dm-8, /dev/block/by-name/userdata,
16777216, 0)
D vold : Opening/dev/block/by-name/userdata
D vold : Opening/dev/block/dm-8
E vold : Reading ext4 extent caused an exception
D vold : cryptfs_enable_inplace_ext4()=-1
[omitted logspam from f2fs_sparseblock]
I vold : Encrypting from block 0
I vold : Encrypted to block 15872
I vold : Encrypting from block 16384
I vold : Encrypted to block 16385
I vold : Encrypting from block 17408
I vold : Encrypted to block 17412
D vold : cryptfs_enable_inplace_f2fs success
I vold : Inplace encryption complete
f2fs after:
D vold : encrypt_inplace(/dev/block/dm-8, /dev/block/by-name/userdata,
16777216, false)
[omitted logspam from f2fs_sparseblock]
I vold : Encrypting f2fs filesystem on /dev/block/by-name/userdata in-place via /dev/block/dm-8
I vold : 15880 blocks (65 MB) of
2097152 blocks are in-use
D vold : Encrypted 10000 of 15880 blocks
D vold : Encrypted 15880 of 15880 blocks
I vold : Successfully encrypted f2fs filesystem on /dev/block/by-name/userdata
Test: Booted Cuttlefish with metadata encryption enabled and with the
userdata filesystem using (1) ext4, (2) f2fs, and (3) f2fs but
with EncryptInplace.cpp patched to not recognize the filesystem
and fall back to the "full" encryption case. Checked that the log
messages were as expected and that /data was mounted.
I've had no luck testing FDE yet; it doesn't work even without
these changes. Suggestions appreciated...
Change-Id: I08fc8465f7962abd698904b5466f3ed080d53953
Eric Biggers [Tue, 3 Nov 2020 22:11:01 +0000 (14:11 -0800)]
Correctly calculate tot_used_blocks on ext4 with uninit_bg
The calculated number of blocks to encrypt is too high on ext4
filesystems that have the uninit_bg feature. This is because the
calculation assumes that all blocks not counted in bg_free_blocks_count
need to encrypted. But actually, uninitialized block groups have inode
blocks which vold doesn't encrypt since they are uninitialized, but they
are "allocated" and thus reduce bg_free_blocks_count.
Therefore, add a helper function num_base_meta_blocks_in_group() which
returns the number of blocks to encrypt in an uninitialized block group.
Use it both for the encryption and for calculating 'tot_used_blocks'.
Also compute 'tot_used_blocks' additively rather than subtractively, as
this is easier to understand.
Test: see I08fc8465f7962abd698904b5466f3ed080d53953
Change-Id: I4d2cb40291da67dd1bafd61289ccb9e6343bfda3
Eric Biggers [Tue, 3 Nov 2020 22:11:01 +0000 (14:11 -0800)]
Fix memory leak of f2fs_info
'struct f2fs_info' from system/extras/f2fs_utils is supposed to be
freed using free_f2fs_info(), not just free().
Test: see I08fc8465f7962abd698904b5466f3ed080d53953
Change-Id: If6e75e5c604b40be24538b156a37cc76f4f0d4f7
Eric Biggers [Tue, 3 Nov 2020 22:11:01 +0000 (14:11 -0800)]
Remove special handling for missing crypto_blkdev
This logic is no longer necessary, since the code that creates the
crypto_blkdev (create_crypto_blk_dev() in MetadataCrypt.cpp or in
cryptfs.cpp) now waits for the block device to appear before continuing.
It's also worth noting that the retry loop was only present for ext4,
not for f2fs, yet most Android devices are using f2fs these days.
Test: see I08fc8465f7962abd698904b5466f3ed080d53953
Change-Id: I173ca6cc187a810e008990dfa22aede58632db25
Eric Biggers [Tue, 3 Nov 2020 22:11:00 +0000 (14:11 -0800)]
Check return value of create_crypto_blk_dev()
cryptfs_enable_internal() forgot to check the return value of
create_crypto_blk_dev(), so it was continuing to
cryptfs_enable_inplace() when creating the dm-crypt device failed, which
doesn't make sense.
Test: see I08fc8465f7962abd698904b5466f3ed080d53953
Change-Id: If9f20069d0f084150aa887a350f7c0c31a6d80f2
Eric Biggers [Tue, 3 Nov 2020 22:11:00 +0000 (14:11 -0800)]
Remove unused support for partial encryption
Commit
87999173dd79 ("Don't corrupt ssd when encrypting and power
fails") added a lot of code to handle pausing in-place conversion from
unencrypted => FDE when the battery was low, and resuming it later.
It was eventually decided that this wasn't needed, and commit
7e17e2d22678 ("Don't worry about battery levels when encrypting")
removed the checks for low battery.
This made the partial encryption code unused. So remove it.
Note that this was cluttering up the metadata encryption code too, since
EncryptInplace.cpp is now shared by both FDE and metadata encryption.
Bug:
16868177
Test: see I08fc8465f7962abd698904b5466f3ed080d53953
Change-Id: Ibd2eb08a2aa15938097abcb8a67b5a813c4d76c7
Eric Biggers [Tue, 3 Nov 2020 18:32:03 +0000 (18:32 +0000)]
Merge changes I8d2bd67d,I704522b2 am:
27f3ab89d0 am:
5a9feb48fa am:
61ffc1b096 am:
0bea8cede9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1484498
Change-Id: I9682cb0afe8eefebeb5f2cf7123bb782325e8ff6
Eric Biggers [Tue, 3 Nov 2020 18:19:09 +0000 (18:19 +0000)]
Merge changes I8d2bd67d,I704522b2 am:
27f3ab89d0 am:
5a9feb48fa am:
61ffc1b096
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1484498
Change-Id: I62f8835572ec93c4808b9af26b39dc0fbe22fe91
Eric Biggers [Tue, 3 Nov 2020 18:04:23 +0000 (18:04 +0000)]
Merge changes I8d2bd67d,I704522b2 am:
27f3ab89d0 am:
5a9feb48fa
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1484498
Change-Id: Ia206b84e8b2ec96882da9c51102f955161ca06f3
Eric Biggers [Tue, 3 Nov 2020 17:48:09 +0000 (17:48 +0000)]
Merge changes I8d2bd67d,I704522b2 am:
27f3ab89d0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1484498
Change-Id: I28ef08b0fe9b3c94b02769f43e21f574e524da57
Eric Biggers [Tue, 3 Nov 2020 17:02:46 +0000 (17:02 +0000)]
Merge changes I8d2bd67d,I704522b2
* changes:
FsCrypt: silently skip "." and ".." when loading keys
Utils: add IsDotOrDotDot() and use it in the appropriate places
Eric Biggers [Tue, 3 Nov 2020 01:41:03 +0000 (01:41 +0000)]
Merge "KeyUtil: don't use keepOld=true for system DE and volume keys" am:
4a969dba60 am:
1d692f3b7b am:
83ff4db88a am:
9a67e05fc3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1480696
Change-Id: Ia074e5546358382ab5ecab4394c96524ed7d90f2
Eric Biggers [Tue, 3 Nov 2020 00:43:46 +0000 (00:43 +0000)]
Merge "KeyUtil: don't use keepOld=true for system DE and volume keys" am:
4a969dba60 am:
1d692f3b7b am:
83ff4db88a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1480696
Change-Id: I23bd8f557ddd143a9e1efa1d9e79a8181f9a5901
Eric Biggers [Tue, 3 Nov 2020 00:23:55 +0000 (00:23 +0000)]
Merge "KeyUtil: don't use keepOld=true for system DE and volume keys" am:
4a969dba60 am:
1d692f3b7b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1480696
Change-Id: Idec4eb2c0afca69c0b322935397bea009f5683f1
Eric Biggers [Thu, 29 Oct 2020 19:59:28 +0000 (12:59 -0700)]
KeyUtil: don't use keepOld=true for system DE and volume keys
Commit
77df7f207dce / http://aosp/
1217657 ("Refactor to use
EncryptionPolicy everywhere we used to use raw_ref") unintentionally
made fscrypt_initialize_systemwide_keys() start specifying keepOld=true
(via default parameter value) when retrieving the system DE key, and
likewise for read_or_create_volkey() and volume keys.
As a result, if the associated Keymaster key needs to be upgraded, the
upgraded key blob gets written to "keymaster_key_blob_upgraded", but it
doesn't replace the original "keymaster_key_blob", nor is the original
key deleted from Keymaster. This happens at every boot, eventually
resulting in the RPMB partition in Keymaster becoming full.
Only the metadata encryption key ever needs keepOld=true, since it's the
only key that isn't stored in /data, and the purpose of keepOld=true is
to allow a key that isn't stored in /data to be committed or rolled back
when a userdata checkpoint is committed or rolled back.
So, fix this bug by removing the default value of keepOld, and
specifying false everywhere except the metadata encryption key.
Note that when an affected device gets this fix, it will finally upgrade
its system DE key correctly. However, this fix doesn't free up space in
Keymaster that was consumed by this bug.
Test: On bramble:
- Flashed rvc-d1-dev build, with wiping userdata
- Flashed a newer build, without wiping userdata
- Log expectedly shows key upgrades:
$ adb logcat | grep 'Upgrading key'
D vold : Upgrading key: /metadata/vold/metadata_encryption/key
D vold : Upgrading key: /data/unencrypted/key
D vold : Upgrading key: /data/misc/vold/user_keys/de/0
D vold : Upgrading key: /data/misc/vold/user_keys/ce/0/current
- Rebooted
- Log unexpectedly shows the system DE key being upgraded again:
$ adb logcat | grep 'Upgrading key'
D vold : Upgrading key: /data/unencrypted/key
- "keymaster_key_blob_upgraded" unexpectedly still exists:
$ adb shell find /data /metadata -name keymaster_key_blob_upgraded
/data/unencrypted/key/keymaster_key_blob_upgraded
- Applied this fix and flashed, without wiping userdata
- Log shows system DE key being upgraded (expected because due to the
bug, the upgraded key didn't replace the original one before)
$ adb logcat | grep 'Upgrading key'
D vold : Upgrading key: /data/unencrypted/key
- "keymaster_key_blob_upgraded" expectedly no longer exists
$ adb shell find /data /metadata -name keymaster_key_blob_upgraded
- Rebooted
- Log expectedly doesn't show any more key upgrades
$ adb logcat | grep 'Upgrading key'
Bug:
171944521
Bug:
172019387
(cherry picked from commit
c493903732d0c17b33091cf722cbcc3262292801)
Merged-In: I42d3f5fbe32cb2ec229f4b614cfb271412a3ed29
Change-Id: I42d3f5fbe32cb2ec229f4b614cfb271412a3ed29
Eric Biggers [Tue, 3 Nov 2020 00:08:56 +0000 (00:08 +0000)]
Merge "KeyUtil: don't use keepOld=true for system DE and volume keys" am:
4a969dba60
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1480696
Change-Id: I45f11f64c84b540a27cdc39af493a2ee4e552bce
Eric Biggers [Mon, 2 Nov 2020 23:11:06 +0000 (15:11 -0800)]
FsCrypt: silently skip "." and ".." when loading keys
Avoid logging useless messages like:
D vold : Skipping non-key .
D vold : Skipping non-key ..
D vold : Skipping non-de-key .
D vold : Skipping non-de-key ..
Change-Id: I8d2bd67d554605a5ab9faadd3730870dfe0881f6
Eric Biggers [Mon, 2 Nov 2020 23:31:56 +0000 (15:31 -0800)]
Utils: add IsDotOrDotDot() and use it in the appropriate places
Change-Id: I704522b26acfb3e7c423d9a14d69ede513b50482
Eric Biggers [Mon, 2 Nov 2020 23:31:23 +0000 (23:31 +0000)]
Merge "KeyUtil: don't use keepOld=true for system DE and volume keys"
Eric Biggers [Thu, 29 Oct 2020 19:59:28 +0000 (12:59 -0700)]
KeyUtil: don't use keepOld=true for system DE and volume keys
Commit
77df7f207dce / http://aosp/
1217657 ("Refactor to use
EncryptionPolicy everywhere we used to use raw_ref") unintentionally
made fscrypt_initialize_systemwide_keys() start specifying keepOld=true
(via default parameter value) when retrieving the system DE key, and
likewise for read_or_create_volkey() and volume keys.
As a result, if the associated Keymaster key needs to be upgraded, the
upgraded key blob gets written to "keymaster_key_blob_upgraded", but it
doesn't replace the original "keymaster_key_blob", nor is the original
key deleted from Keymaster. This happens at every boot, eventually
resulting in the RPMB partition in Keymaster becoming full.
Only the metadata encryption key ever needs keepOld=true, since it's the
only key that isn't stored in /data, and the purpose of keepOld=true is
to allow a key that isn't stored in /data to be committed or rolled back
when a userdata checkpoint is committed or rolled back.
So, fix this bug by removing the default value of keepOld, and
specifying false everywhere except the metadata encryption key.
Note that when an affected device gets this fix, it will finally upgrade
its system DE key correctly. However, this fix doesn't free up space in
Keymaster that was consumed by this bug.
Test: On bramble:
- Flashed rvc-d1-dev build, with wiping userdata
- Flashed a newer build, without wiping userdata
- Log expectedly shows key upgrades:
$ adb logcat | grep 'Upgrading key'
D vold : Upgrading key: /metadata/vold/metadata_encryption/key
D vold : Upgrading key: /data/unencrypted/key
D vold : Upgrading key: /data/misc/vold/user_keys/de/0
D vold : Upgrading key: /data/misc/vold/user_keys/ce/0/current
- Rebooted
- Log unexpectedly shows the system DE key being upgraded again:
$ adb logcat | grep 'Upgrading key'
D vold : Upgrading key: /data/unencrypted/key
- "keymaster_key_blob_upgraded" unexpectedly still exists:
$ adb shell find /data /metadata -name keymaster_key_blob_upgraded
/data/unencrypted/key/keymaster_key_blob_upgraded
- Applied this fix and flashed, without wiping userdata
- Log shows system DE key being upgraded (expected because due to the
bug, the upgraded key didn't replace the original one before)
$ adb logcat | grep 'Upgrading key'
D vold : Upgrading key: /data/unencrypted/key
- "keymaster_key_blob_upgraded" expectedly no longer exists
$ adb shell find /data /metadata -name keymaster_key_blob_upgraded
- Rebooted
- Log expectedly doesn't show any more key upgrades
$ adb logcat | grep 'Upgrading key'
Bug:
171944521
Bug:
172019387
Change-Id: I42d3f5fbe32cb2ec229f4b614cfb271412a3ed29
Eric Biggers [Wed, 28 Oct 2020 17:32:35 +0000 (17:32 +0000)]
Merge "Fix argument type for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS" am:
569fb8365e am:
524e094991 am:
2fe31ededf am:
d6f1a98f4b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1472321
Change-Id: I7076af0682da1f282254326a54a9ce758e6bf180
Eric Biggers [Wed, 28 Oct 2020 17:18:50 +0000 (17:18 +0000)]
Merge "Fix argument type for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS" am:
569fb8365e am:
524e094991 am:
2fe31ededf
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1472321
Change-Id: Ica87f8b5d1a4eea3e403f5694f2557fa6891d002
Eric Biggers [Wed, 28 Oct 2020 16:50:42 +0000 (16:50 +0000)]
Merge "Fix argument type for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS" am:
569fb8365e am:
524e094991
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1472321
Change-Id: I7d9b20e25b93c0f9707714027ab6c15fa9d224f7
Eric Biggers [Wed, 28 Oct 2020 16:26:09 +0000 (16:26 +0000)]
Merge "Fix argument type for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS" am:
569fb8365e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1472321
Change-Id: I5cb2651ee48ab2a9afb9ec5ded8259cd006ecbfe
Eric Biggers [Wed, 28 Oct 2020 16:16:26 +0000 (16:16 +0000)]
Merge "Fix argument type for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS"
Eric Biggers [Fri, 23 Oct 2020 23:32:58 +0000 (16:32 -0700)]
Fix argument type for FS_IOC_GETFLAGS and FS_IOC_SETFLAGS
These ioctls take a pointer to an 'int' (or an 'unsigned int', it
doesn't matter), not an 'unsigned long'. See 'man ioctl_iflags'.
Presumably it happened to work anyway because Android only runs on
little endian platforms.
Bug:
146419093
Bug:
163453310
Change-Id: I73099dafd4ee8d497c0a754149271871a37454f6
Signed-off-by: Eric Biggers <ebiggers@google.com>
Yo Chiang [Mon, 26 Oct 2020 07:05:58 +0000 (07:05 +0000)]
Merge "Add IVold::destroyDsuMetadataKey()" am:
cb581cc8de am:
3ae0c6737c am:
9502610f8e am:
a182ca0ef1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1452395
Change-Id: I3dd03f19011a5045425f665727b6c439d40c07df
Yo Chiang [Mon, 26 Oct 2020 06:37:07 +0000 (06:37 +0000)]
Merge "Add IVold::destroyDsuMetadataKey()" am:
cb581cc8de am:
3ae0c6737c am:
9502610f8e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1452395
Change-Id: I79d72f95e00888afa69f55b48e76f28d47972457
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
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
Yo Chiang [Mon, 26 Oct 2020 05:27:36 +0000 (05:27 +0000)]
Merge "Add IVold::destroyDsuMetadataKey()"
Treehugger Robot [Thu, 22 Oct 2020 06:10:13 +0000 (06:10 +0000)]
[automerger skipped] Merge "Set media folder +F for adopted storage as well" am:
739ca2c298 am:
19adff5f27 am:
e2fefec3bb -s ours am:
4bcbd7a4d7 -s ours
am skip reason: Change-Id I08f13b57a4de3538e88b38eb95b0ac115a5a5ce8 with SHA-1
083221f5cf is in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1397560
Change-Id: I19ebde72ad2fa459e2ff2d6f017c68a66f7e6e9a
Treehugger Robot [Thu, 22 Oct 2020 05:50:25 +0000 (05:50 +0000)]
[automerger skipped] Merge "Set media folder +F for adopted storage as well" am:
739ca2c298 am:
19adff5f27 am:
e2fefec3bb -s ours
am skip reason: Change-Id I08f13b57a4de3538e88b38eb95b0ac115a5a5ce8 with SHA-1
083221f5cf is in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1397560
Change-Id: Iee4294f9e16c934cfc99daed87fd9ad7b678fe56
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
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
Treehugger Robot [Wed, 21 Oct 2020 22:04:11 +0000 (22:04 +0000)]
Merge "Set media folder +F for adopted storage as well"
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
Eric Biggers [Wed, 21 Oct 2020 01:06:23 +0000 (01:06 +0000)]
Merge "vold: Generate storage key without rollback resistance" am:
4f5e9c196f am:
b6d1a31949 am:
6417fb00bd am:
4855216c24
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1426109
Change-Id: If534937befdb36af254004e535a1dae47bb24ca4
Eric Biggers [Wed, 21 Oct 2020 00:51:20 +0000 (00:51 +0000)]
Merge "vold: Generate storage key without rollback resistance" am:
4f5e9c196f am:
b6d1a31949 am:
6417fb00bd
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1426109
Change-Id: I02bf9412685cd1cd0b3bef6783035b9017fce337
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
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
Eric Biggers [Tue, 20 Oct 2020 23:17:22 +0000 (23:17 +0000)]
Merge "vold: Generate storage key without rollback resistance"
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
Eric Biggers [Mon, 19 Oct 2020 18:02:25 +0000 (18:02 +0000)]
Merge changes Idc575106,Id6457a2b am:
3e0e53dbe5 am:
8671044a64 am:
377a71922d am:
5d2092bf82
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1462712
Change-Id: I846f549f9e7cd0e702d75bfdc02c6b21b217d7b2
Eric Biggers [Mon, 19 Oct 2020 18:02:16 +0000 (18:02 +0000)]
Merge "MetadataCrypt: remove unnecessary retry loop" am:
80fdc5a4e3 am:
5a1e03f705 am:
c65ba5bd4c am:
e488044d97
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1462708
Change-Id: Iddf63df190b76b45adbf8757daf0bfa085dd2577
Eric Biggers [Mon, 19 Oct 2020 18:01:58 +0000 (18:01 +0000)]
Merge "Silence useless LOOP_GET_STATUS64 warnings" am:
6f70c92aee am:
4d0d21e69d am:
c823f0b95f am:
36a0a80bdf
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1462709
Change-Id: If626bc254fd9c855930d70851823c32bc4f7ac54
Eric Biggers [Mon, 19 Oct 2020 17:49:13 +0000 (17:49 +0000)]
Merge changes Idc575106,Id6457a2b am:
3e0e53dbe5 am:
8671044a64 am:
377a71922d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1462712
Change-Id: I13758415cf228dae8b4d708ea67b58acb98781ed
Eric Biggers [Mon, 19 Oct 2020 17:49:03 +0000 (17:49 +0000)]
Merge "MetadataCrypt: remove unnecessary retry loop" am:
80fdc5a4e3 am:
5a1e03f705 am:
c65ba5bd4c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1462708
Change-Id: I897b84d329e2bb58ade03a66bcf7056174180a97
Eric Biggers [Mon, 19 Oct 2020 17:48:45 +0000 (17:48 +0000)]
Merge "Silence useless LOOP_GET_STATUS64 warnings" am:
6f70c92aee am:
4d0d21e69d am:
c823f0b95f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1462709
Change-Id: I0333415fa84d00038d86e7264941cc3249aac41d
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
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
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
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
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
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
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
Eric Biggers [Mon, 19 Oct 2020 16:05:53 +0000 (16:05 +0000)]
Merge "MetadataCrypt: remove unnecessary retry loop"
Eric Biggers [Mon, 19 Oct 2020 16:05:17 +0000 (16:05 +0000)]
Merge "Silence useless LOOP_GET_STATUS64 warnings"
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
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
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
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
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
Martijn Coenen [Mon, 12 Oct 2020 20:13:09 +0000 (20:13 +0000)]
Merge "Use dm.CreateDevice() with a timeout." am:
e9023dc7bb am:
7da18c97ef am:
3d5a8fd0d9 am:
08dcc7ee30
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1456266
Change-Id: If4eaea18576b81c87c1d90cc70ae423a408365cd
Martijn Coenen [Mon, 12 Oct 2020 19:22:11 +0000 (19:22 +0000)]
Merge "Use dm.CreateDevice() with a timeout." am:
e9023dc7bb am:
7da18c97ef am:
3d5a8fd0d9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1456266
Change-Id: Ib1fc9055a823fd3aa7fb4e0e5ae4eb3d5077fb05
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
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
Martijn Coenen [Mon, 12 Oct 2020 18:07:39 +0000 (18:07 +0000)]
Merge "Use dm.CreateDevice() with a timeout."
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
Xin Li [Fri, 9 Oct 2020 06:06:14 +0000 (06:06 +0000)]
[automerger skipped] Skip ab/
6749736 in stage. am:
fd4abc5e72 -s ours am:
054a3f817f -s ours am:
e011686c86 -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: I1382e2d9bf9f50af71de6ed9fb626da927562bd1
Xin Li [Fri, 9 Oct 2020 04:17:47 +0000 (04:17 +0000)]
[automerger skipped] Skip ab/
6749736 in stage. am:
fd4abc5e72 -s ours am:
054a3f817f -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: I1af7aee356927bb93b031c1deafc7cd00b89f848
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
Xin Li [Fri, 9 Oct 2020 00:24:08 +0000 (17:24 -0700)]
Skip ab/
6749736 in stage.
Merged-In: I876aaf6bba933c964a3573d8053cc60829b3a5fa
Change-Id: I4c8616d3c17e3b9818bde3299fcc79f5444a95f5
Corina Grigoras [Tue, 6 Oct 2020 19:31:16 +0000 (19:31 +0000)]
Merge "Add core scoped storage host test to test mapping."
Alan Stokes [Mon, 5 Oct 2020 10:19:37 +0000 (10:19 +0000)]
Merge "Enable vold to set level from user." am:
dd66de13ea am:
cfc66f28b1 am:
77894409cf am:
d451f0aa0d am:
d47b984b76
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1437215
Change-Id: I87cde0a99720f4605022b0e4790543d85abff1cf
Alan Stokes [Mon, 5 Oct 2020 10:02:02 +0000 (10:02 +0000)]
Merge "Enable vold to set level from user." am:
dd66de13ea am:
cfc66f28b1 am:
77894409cf am:
d451f0aa0d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1437215
Change-Id: I696092859446e246dcdff624f056bd6d2fb445ac
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
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
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
Alan Stokes [Mon, 5 Oct 2020 08:23:08 +0000 (08:23 +0000)]
Merge "Enable vold to set level from user."
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
Treehugger Robot [Thu, 24 Sep 2020 17:51:29 +0000 (17:51 +0000)]
Merge "vold: remove unused stop() methods" am:
d70e2b4ea9 am:
27a747b8ab am:
406cabf717 am:
93f0960cba am:
3c11d4611a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1434595
Change-Id: I43ef4d8caa664d484a3eb6c8e1fde2e6974620a8
Treehugger Robot [Thu, 24 Sep 2020 17:37:59 +0000 (17:37 +0000)]
Merge "vold: remove unused stop() methods" am:
d70e2b4ea9 am:
27a747b8ab am:
406cabf717 am:
93f0960cba
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/
1434595
Change-Id: I51672944372d24483679d6f81df4e80869d3fd99
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
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
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
Treehugger Robot [Thu, 24 Sep 2020 16:06:58 +0000 (16:06 +0000)]
Merge "vold: remove unused stop() methods"