When using multiple partitions, f2fs stores all the device paths, but we cannot
guarantee the dm targets are all the same across boot cycles.
Bug: 287247093
Change-Id: Ie4308a27548d4e814924afb656478cfa55fcf8b6
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Adding new modules to TEST_MAPPING after splitting
CtsScopedStorageDeviceOnlyTest
Ignore-AOSP-First: We've split a module in internal repo, so we can't add them in TEST_MAPPING on AOSP.
Bug: 294741813
Test: atest
Change-Id: I8efef8efbc9f01e1177fbe3105513166ad90d22f
Its possible for vold to read a pid from procfs, the pid is killed
externally and then vold tries to kill it. In this scenario, we sleep
for 5s without needing it. Verify the return value from the kill syscall
and validate that the pid was killed, if the pid didn't exist at the
moment of the kill call, then don't count the pid as being killed.
Test: Boots successfully
Bug: 307801020
Change-Id: Ie127108b85be7249cf8b2881f4917d653d032186
Rename methods that refer to "user key" to be more precise about what
they mean. For more details, see the corresponding frameworks/base
changes (I202ebbfd2b4f79fedb3ed120a8ad81500c126894 and
I5894beb97823dced5954e405d779fada49c79e8d).
No change in behavior except for some changed log messages.
Flag: exempt, mechanical refactoring only
Test: presubmit
Change-Id: I9edcb557172395f4f6cf8e837efcc06fcfefb37d
am skip reason: Merged-In If530edaf7c1566dd3bd8b1322f935f38a2e66beb with SHA-1 2b97a88ba4 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2777079
Change-Id: I05969a9df342d2d617241579977b3ee52c371199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I7f11a135d8550618cd96013f834cebd54be5ef84 with SHA-1 68fd3689a1 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2685268
Change-Id: Iffdb0b384b53654700389e51d9faefc3d74d8810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I28412f243925b5a7242449b617fe9de9c90912b6 with SHA-1 3529302ede is already in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2777078
Change-Id: I217fefdbc72d638c5745e9e0c661af258ffbd0a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ia27a61faf2fdd546cdbddb2a3985c7c6696f6aa6 with SHA-1 ce86e24d23 is already in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2777077
Change-Id: I8e611a75a48b07f24d83cc5747bdb329a760dc1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If221e23991e8e04138ae7dbdafe8160b00893655 with SHA-1 92428b247f is already in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2777076
Change-Id: Ide1373872599f804d86842add4027b28ef0d3486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ic9bc7a7971790fa19a04181b6f89a33a0088bdd8 with SHA-1 efe3c891bd is already in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2775038
Change-Id: If73220e1ec9f763882f7661119dc53584c1e1f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ic9bc7a7971790fa19a04181b6f89a33a0088bdd8 with SHA-1 efe3c891bd is already in history
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2775038
Change-Id: Icc58f9c9f3895e2ee97626c8ae13e23a2b8419f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
* changes:
Revert "fskeyring & userspace reboot: support CE keys"
Evict adoptable storage CE and DE keys when possible
Don't erase key from s_new_ce_keys on eviction
Call fscrypt_destroy_volume_keys() under mCryptLock
Fold read_and_install_user_ce_key() into fscrypt_unlock_user_key()
Userspace reboot turned out to be a dead end and is no longer supported.
Therefore, remove the code from vold that handled keeping CE storage
unlocked past the userdata filesystem being unmounted and mounted.
This is a revert of commit 1c6731c649 (https://r.android.com/1254615)
with various conflicts resolved.
Bug: 292469129
Change-Id: If530edaf7c1566dd3bd8b1322f935f38a2e66beb
Merged-In: If530edaf7c1566dd3bd8b1322f935f38a2e66beb
(cherry picked from commit 2b97a88ba4)
Adoptable storage CE and DE keys were not being explicitly evicted,
resulting in the benefits of key eviction not being fully realized on
devices that use adoptable storage. Fix this by evicting the adoptable
storage keys when the corresponding internal storage keys are evicted:
- In lockUserKey, evict the CE keys for adoptable storage volumes, not
just the CE key for internal storage as was done before.
- In destroyUserKey, evict the user's CE and DE keys for adoptable
storage, not just the internal storage keys as was done before.
To make this possible, starting keeping track of the EncryptionPolicy of
each currently installed adoptable storage key.
(This CL is reworked from https://r.android.com/2660878,
original author Arnab Sen <arnabse@amazon.com>)
Test: On Cuttlefish with config_multiuserMaxRunningUsers changed to 1:
sm set-virtual-disk true
sm partition disk:7,416 private
pm create-user 10
am start-user 10
am stop-user 10
# Verified that this fails with "Required key not available".
touch /mnt/expand/f1ad173b-d6d9-4948-8eb7-ccdd7b053b22/misc_ce/10/foo.txt
am start-user 10
pm remove-user 10
# Checked for all the expected "Evicted fscrypt key" messages.
# 2 from when user was stopped, and 4 from when user was removed.
adb logcat | grep Evicted
Change-Id: I7f11a135d8550618cd96013f834cebd54be5ef84
Merged-In: I7f11a135d8550618cd96013f834cebd54be5ef84
(cherry picked from commit 68fd3689a1)
