Commit graph

5691 commits

Author SHA1 Message Date
David Anderson
3937b479bd Merge "Populate the dm table of the early userdata device." 2022-12-12 18:38:05 +00:00
Martijn Coenen
1968bd5a1b Merge "Support bind mounting volumes into other volume's mountpoint." am: 35eb1ae88a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2189643

Change-Id: I3e0528ff7a114971a8b6da9cc939c3de0de9fd4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 08:03:52 +00:00
Martijn Coenen
35eb1ae88a Merge "Support bind mounting volumes into other volume's mountpoint." 2022-12-09 07:42:00 +00:00
David Anderson
7b769bc5b1 Populate the dm table of the early userdata device.
DM_DEV_CREATE no longer creates sysfs nodes as of Linux kernel 5.15. It
is now necessary to DM_TABLE_LOAD as well.

Bug: 259328366
Test: userdata mounts
Change-Id: I0f88afdf95a97d44eb365e4302bbfdc7c28c0bcb
2022-12-08 16:23:45 -08:00
Martijn Coenen
73e3010a25 Support bind mounting volumes into other volume's mountpoint.
With the way the FUSE mount point are currently setup for emulated
volumes, there can be multiple paths that serve the same files on the
lower filesystem; eg

* /mnt/user/0/emulated/0/Android
* /mnt/user/10/emulated/0/Android

both refer to the same file on the lower filesystem:
* /data/media/0/Android

this is normally not a problem, because cross-user file access is not
allowed, and so the FUSE daemon won't serve files for other users.

With clone profiles this is no longer true however, as their volumes
are accessible by each other.

So, it can happen that an app running in clone profile 10 accesses
"/mnt/user/10/emulated/0/Android", which would be served by the FUSE
daemon for the user 10 filesystem.

At the same time, an app running in the owner profile 0 accesses
"mnt/user/0/emulated/0/Android", which would be served by the FUSE
daemon for the user 0 filesystem.

This can cause page cache inconsistencies, because multiple FUSE daemons
can be running on top of the same entries in the lower filesystem.

To prevent this, use bind mounts to make sure that cross-profile
accesses actually end up in the FUSE daemon to which the volume
belongs: "/mnt/user/10/emulated/0" is bind-mounted to
"/mnt/user/0/emulated/0", and vice-versa.

Bug: 228271997
Test: manual
Change-Id: Iefcbc813670628b329a1a5d408b6126b84991e09
2022-12-07 09:01:27 +00:00
Treehugger Robot
c63d77bc61 Merge "Ignore DE retrieveKey failure for non-user-0" am: 1cb65f9de5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2242642

Change-Id: Iecab2ad6f570e4083c1ad8dc8b432c56125befa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29 02:17:11 +00:00
Treehugger Robot
1cb65f9de5 Merge "Ignore DE retrieveKey failure for non-user-0" 2022-11-29 01:19:25 +00:00
liulvping
69b048507f Ignore DE retrieveKey failure for non-user-0
retrieveKey can fail in load_all_de_keys if a user
is partially removed, i.e. cases where
fscrypt_destroy_user_key() got interrupted. So just
ignore the failure, else could reboot into recovery.

Test: pm create-user foo
      pm remove-user 10
      adb reboot && check device not enter recovery

Signed-off-by: liulvping <liulvping@xiaomi.com>
Change-Id: Iba9d53a0833524d00e65d0427ab03002c5d8d509
2022-11-25 00:59:14 +00:00
Paul Crowley
3589e76deb Merge "Fix unhandled exception when FUSE disabled" am: 20b1532b85
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2282933

Change-Id: Iaceb4670a0032ac31bfe330e3f879b06fa351050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 14:09:34 +00:00
Paul Crowley
20b1532b85 Merge "Fix unhandled exception when FUSE disabled" 2022-11-09 13:42:39 +00:00
Oleg Lyovin
667de184ed Fix unhandled exception when FUSE disabled
When running on kernel without FUSE, fs::directory_iterator
throws exception since /sys/fs/fuse/connections is missing.

This patch uses non-throwing fs::directory_iterator
and adds explicit error check.

Test: vold doesn't fail with FUSE disabled
Signed-off-by: Oleg Lyovin <ovlevin@sberdevices.ru>
Change-Id: I51b68363edf75033fcec3ce5623f419d5a68c991
2022-11-08 18:49:18 +03:00
Eric Biggers
20695553e1 Merge "Stop using the "stretching" file" am: b0a170136c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2252876

Change-Id: Idc5c0d3e11e9091e4c83d34188d961d5531718e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 20:17:14 +00:00
Eric Biggers
b0a170136c Merge "Stop using the "stretching" file" 2022-10-13 19:46:32 +00:00
Eric Biggers
f187f05110 Stop using the "stretching" file
As a small optimization and code simplification, stop reading and
writing the "stretching" file alongside each stored key.  vold never
does key stretching anymore.

There was one special case in the code where if the stretching file
existed and contained "nopassword", then the secret was ignored.
However, this didn't seem to be of any use, especially since it didn't
cause Keystore to be used, so it did *not* allow a key stored with no
secret to be read if a secret was unexpectedly provided.

Bug: 232452368
Bug: 251131631
Bug: 251147505
Change-Id: I5a7cbba7492526e51c451f222b9413d9fae6bce5
2022-10-13 04:11:27 +00:00
Eric Biggers
da999d55e5 Merge "Don't use a secdiscardable file for keys encrypted by SP" am: 7cc31eb7b0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2242561

Change-Id: Id6c2f7797065a1bdec29996ef8433b8721bacfa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 16:55:00 +00:00
Eric Biggers
7cc31eb7b0 Merge "Don't use a secdiscardable file for keys encrypted by SP" 2022-10-10 16:26:26 +00:00
Eric Biggers
08f4bdfe98 Don't use a secdiscardable file for keys encrypted by SP
Storage keys that are encrypted by the user's synthetic password don't
need to be securely deletable by vold, since secure deletion is already
implemented at a higher level: the synthetic password protectors managed
by LockSettingsService.  Therefore, remove the use of the secdiscardable
file by vold in this case to improve performance.

Bug: 232452368
Bug: 251131631
Bug: 251147505
Change-Id: I847d6cd3b289dbeb1ca2760d6e261a78c179cad0
2022-10-07 16:26:29 +00:00
Eric Biggers
17cf387bca Merge "cryptfs: Update the size of dm-crypt device according to sector size" am: 03ad91c3c2 am: c33624f8b2 am: cfa19bbb92 am: 56c8e62553
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2230826

Change-Id: I564af10985e9f957d981f9985f1c0bfe18a107d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 18:38:39 +00:00
Eric Biggers
56c8e62553 Merge "cryptfs: Update the size of dm-crypt device according to sector size" am: 03ad91c3c2 am: c33624f8b2 am: cfa19bbb92
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2230826

Change-Id: I2e226ca8f977ca2f0297754808ebd78d2b0a1b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 17:56:58 +00:00
Eric Biggers
cfa19bbb92 Merge "cryptfs: Update the size of dm-crypt device according to sector size" am: 03ad91c3c2 am: c33624f8b2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2230826

Change-Id: I29988364b1584f326b39fdabeb4b51d167758aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 17:27:23 +00:00
Eric Biggers
c33624f8b2 Merge "cryptfs: Update the size of dm-crypt device according to sector size" am: 03ad91c3c2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2230826

Change-Id: I73de338c1bd35c3257a473183bf0e0cfebe179b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 16:57:43 +00:00
Eric Biggers
03ad91c3c2 Merge "cryptfs: Update the size of dm-crypt device according to sector size" 2022-09-29 16:26:44 +00:00
Hongyu Jin
8eeb028338 cryptfs: Update the size of dm-crypt device according to sector size
The legacy method for metadata encryption on adoptable storage failed
when the size of the block device isn't a multiple of the crypto sector size.

Update the size of dm-crypt device according to sector size
before construct dm_target.

Bug: 248582018
Change-Id: I5c78889bdfedca7f7b0704500fc313d7a48d5a3b
Signed-off-by: Hongyu Jin <hongyu.jin@unisoc.com>
2022-09-28 17:44:44 +08:00
Automerger Merge Worker
af757e65cb [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 9ac39c470e -s ours am: b4a0098b68 -s ours am: 86b47687be -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I0f16d59d0fd19f3e1c31f1e1b34f7745a1854ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:09:55 +00:00
Xin Li
0a83c797d7 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours am: 54f0f20543 -s ours am: 597549b42f -s ours am: 2a7108b74d -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: Ic61f28f1c336a049d02664b12a4d6c95c98323b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 01:09:32 +00:00
Automerger Merge Worker
86b47687be [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 9ac39c470e -s ours am: b4a0098b68 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I66e62f75632b9997f411989952dea65f6cbb6c9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:55:28 +00:00
Xin Li
2a7108b74d [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours am: 54f0f20543 -s ours am: 597549b42f -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: Ia960d269e55ca3a616f92e35d78eb775b0f42089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:55:03 +00:00
Xin Li
09f73b0583 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours am: e23109dbf7 -s ours am: dadfcc26b9 -s ours am: 3fae96b70b -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I8081ab864aaf5d222f02a0ac3cf8557b058a959c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:50:25 +00:00
Xin Li
0bf71b45f0 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 302f60e5f3 -s ours am: 24dc4748aa -s ours am: 1919d625b8 -s ours am: 169df91cca -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I22c2be9483000fbf4b7c44190828b7ee96bc7ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:50:02 +00:00
Elliott Hughes
ee8e50a9c1 Merge "Switch to C23's memset_explicit()." am: dd7cfa9e15 am: 6e9353e630 am: f90e6ab299 am: e88b2d376b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2184090

Change-Id: I355ae1a0520518741a48a1a6bc94d66cf703810c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:34:59 +00:00
Trevor Radcliffe
7b95754f91 Merge "Point directly to generated c sysprop_library" am: bdba7cdaa3 am: 891e2f0730 am: 63f5844cc9 am: 18556ea24e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2119958

Change-Id: I5fca3a2c831dcddebd93b2cb7fbc09036c39720f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:34:51 +00:00
Automerger Merge Worker
b4a0098b68 Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 9ac39c470e -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: Iebbbc82040a8b9f9126b17e5be21f669bd79e86d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:29:50 +00:00
Xin Li
597549b42f [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours am: 54f0f20543 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I02b02043d7fd112d860c3c39e92e78abbac136fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:29:27 +00:00
Xin Li
3fae96b70b [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours am: e23109dbf7 -s ours am: dadfcc26b9 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I7876d4bf00b328961ea1f40dfdc1d7d745599485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:26:13 +00:00
Xin Li
169df91cca [automerger skipped] DO NOT MERGE - Merge Android 13 am: 302f60e5f3 -s ours am: 24dc4748aa -s ours am: 1919d625b8 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I706e111de9d7ee32e3c26602e0c7f458d9156eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:25:48 +00:00
Elliott Hughes
e88b2d376b Merge "Switch to C23's memset_explicit()." am: dd7cfa9e15 am: 6e9353e630 am: f90e6ab299
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2184090

Change-Id: Ice2f0eb42de6d03b4a35639f9e34410d1ffb77da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:14:35 +00:00
Trevor Radcliffe
18556ea24e Merge "Point directly to generated c sysprop_library" am: bdba7cdaa3 am: 891e2f0730 am: 63f5844cc9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2119958

Change-Id: I022c14ad62d10059ab1ae43d66592968d70d1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:14:27 +00:00
Xin Li
dadfcc26b9 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours am: e23109dbf7 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I35727301158f7d64c0b39ad110add2f3e84ef86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:00:11 +00:00
Xin Li
1919d625b8 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 302f60e5f3 -s ours am: 24dc4748aa -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: Icfebe368155bc2ccf36884a5df443e05b2b77880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:59:47 +00:00
Elliott Hughes
f90e6ab299 Merge "Switch to C23's memset_explicit()." am: dd7cfa9e15 am: 6e9353e630
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2184090

Change-Id: I11c96a825838d6731a970b2f6f29e3e7d8623274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:48:23 +00:00
Automerger Merge Worker
9ac39c470e Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master
* changes:
  [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours
  [automerger skipped] DO NOT MERGE - Merge Android 13 am: 302f60e5f3 -s ours
2022-08-16 23:42:39 +00:00
Trevor Radcliffe
63f5844cc9 Merge "Point directly to generated c sysprop_library" am: bdba7cdaa3 am: 891e2f0730
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2119958

Change-Id: I6663c7542e5c0e9a789ef05928f417d545c61382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:40:46 +00:00
Xin Li
54f0f20543 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I6eff7575ea94ee938277937c0e71c444fe406fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:40:08 +00:00
Xin Li
6c728ee4e5 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 302f60e5f3 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: Ic4c3d68fe49f3988565ff3795e9b1be9edca1d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:39:43 +00:00
Xin Li
e23109dbf7 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 3f658163ee -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: Iabeb25ab39981b7977fc71f487b7d33bc6d1a65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:37:43 +00:00
Xin Li
24dc4748aa [automerger skipped] DO NOT MERGE - Merge Android 13 am: 302f60e5f3 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I3bae754efa80e9a9b8d8b91095c0576c0ff3f6a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:37:17 +00:00
Elliott Hughes
6e9353e630 Merge "Switch to C23's memset_explicit()." am: dd7cfa9e15
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2184090

Change-Id: I8efda0a63bae994f8e2949de49ff46fd5b15abb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:03:38 +00:00
Trevor Radcliffe
891e2f0730 Merge "Point directly to generated c sysprop_library" am: bdba7cdaa3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2119958

Change-Id: I225b2a38726c4506c71a46e8c97ea0cba31e406b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:03:28 +00:00
TreeHugger Robot
5a7e175f67 [automerger skipped] Merge "KeyStorage: don't request rollback resistance for wrapped storage keys" into tm-qpr-dev am: 6873460493 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I899a8ab81db246ce29293c706f2bc30e01cb649f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 21:34:13 +00:00
Eric Biggers
f1414dff9c [automerger skipped] KeyStorage: don't request rollback resistance for wrapped storage keys am: e11788d0f0 -s ours
am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890d2 is already in history

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

Change-Id: I4f23a56ba26c4a2531524b51f278079dd04215fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 21:34:12 +00:00