tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6300 commits 1 branch 0 tags 9.7 MiB
Commit graph

6300 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Biggers
0798ed5470 Don't erase key from s_new_ce_keys on eviction 
Erasing a key from s_new_ce_keys is equivalent to destroying it, so it
shouldn't be done when the key is merely being evicted.

This didn't matter in practice since eviction requests don't come in
before the key gets persisted, but fix this to avoid confusion.

Test: see I7f11a135d8550618cd96013f834cebd54be5ef84
Change-Id: I28412f243925b5a7242449b617fe9de9c90912b6
Merged-In: I28412f243925b5a7242449b617fe9de9c90912b6
(cherry picked from commit 3529302ede)
 2023-10-06 15:30:15 +00:00
Eric Biggers
7862729266 Call fscrypt_destroy_volume_keys() under mCryptLock 
Everything in FsCrypt.cpp seems to run under VolumeManager::mCryptLock,
except for fscrypt_destroy_volume_keys() which uses mLock instead.

This was sort of okay because fscrypt_destroy_volume_keys() didn't
operate on any in-memory data structures.  However, that is going to be
changed.  Therefore, rework VoldNativeService::forgetPartition() to call
fscrypt_destroy_volume_keys() under mCryptLock.

Test: see I7f11a135d8550618cd96013f834cebd54be5ef84
Change-Id: Ia27a61faf2fdd546cdbddb2a3985c7c6696f6aa6
Merged-In: Ia27a61faf2fdd546cdbddb2a3985c7c6696f6aa6
(cherry picked from commit ce86e24d23)
 2023-10-06 15:30:13 +00:00
Eric Biggers
fc1df0eae0 Fold read_and_install_user_ce_key() into fscrypt_unlock_user_key() 
No change in behavior, except for removing a redundant check of
's_ce_policies.count(user_id)' and removing an extra ERROR message.

Test: see I7f11a135d8550618cd96013f834cebd54be5ef84
Change-Id: If221e23991e8e04138ae7dbdafe8160b00893655
Merged-In: If221e23991e8e04138ae7dbdafe8160b00893655
(cherry picked from commit 92428b247f)
 2023-10-06 15:30:09 +00:00
Xin Li
5d0830aabc [automerger skipped] Merge "Merge Android 14" into main am: ab9fe7e68a -s ours am: e9e8fb9d0a -s ours am: 1a4ffde614 -s ours am: 14e615ae30 -s ours 
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: Ibb6f487a7d66e42001e6d9d1033e2de48745c3f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:05:58 +00:00
Xin Li
3ace5dabe1 [automerger skipped] Merge Android 14 am: a4f866af63 -s ours am: 687abb918b -s ours am: 3bc1479601 -s ours am: a8044308a6 -s ours 
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: I4c711ba7124c439599c458755a987a54701f1382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:00:41 +00:00
Xin Li
14e615ae30 [automerger skipped] Merge "Merge Android 14" into main am: ab9fe7e68a -s ours am: e9e8fb9d0a -s ours am: 1a4ffde614 -s ours 
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: I99d21d97b0bd420673104f69208e04d3d6d2effa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:56:10 +00:00
Xin Li
a8044308a6 [automerger skipped] Merge Android 14 am: a4f866af63 -s ours am: 687abb918b -s ours am: 3bc1479601 -s ours 
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: I5c1e859445bee2b03bf313e2c673898039cefbad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:50:50 +00:00
Xin Li
1a4ffde614 [automerger skipped] Merge "Merge Android 14" into main am: ab9fe7e68a -s ours am: e9e8fb9d0a -s ours 
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: I49a77e24d9d8f0e1417fcec64f0d3c5f24a14aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:04:35 +00:00
Xin Li
3bc1479601 [automerger skipped] Merge Android 14 am: a4f866af63 -s ours am: 687abb918b -s ours 
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: If904a0387645ba8db75f57e6d15b8ef20a499d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 08:59:16 +00:00
Xin Li
e9e8fb9d0a [automerger skipped] Merge "Merge Android 14" into main am: ab9fe7e68a -s ours 
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: I2c8fd7b65a804c02742021fe03f151bf1de29c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:57:30 +00:00
Xin Li
687abb918b [automerger skipped] Merge Android 14 am: a4f866af63 -s ours 
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: I37e11e5e0d4783306319b8ea40dbeb1fe01e8e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:52:10 +00:00
Xin Li
ab9fe7e68a Merge "Merge Android 14" into main 2023-10-06 05:34:19 +00:00
Xin Li
a4f866af63 Merge Android 14 
Bug: 298295554
Merged-In: Ic9bc7a7971790fa19a04181b6f89a33a0088bdd8
Change-Id: I4ac11a6613a6a01fe24ac273d7e2e25497309c25
 2023-10-05 15:45:30 -07:00
Treehugger Robot
6c2369b81e Merge "Handle errors corrected exit status returned by fsck" into main am: 81ed259a35 am: 963b84c497 am: 02f6f002a4 am: f1ebbef37e am: 2f96ee927c 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2651499

Change-Id: Iac8e80432e400bac4fd491b980536d32a30e1893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 05:34:00 +00:00
Treehugger Robot
2f96ee927c Merge "Handle errors corrected exit status returned by fsck" into main am: 81ed259a35 am: 963b84c497 am: 02f6f002a4 am: f1ebbef37e 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2651499

Change-Id: Ibdaaac04f61c07818bfb3e2b51b5d9db6b6f1a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 04:34:28 +00:00
Treehugger Robot
f1ebbef37e Merge "Handle errors corrected exit status returned by fsck" into main am: 81ed259a35 am: 963b84c497 am: 02f6f002a4 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2651499

Change-Id: I651ea0110878c084f899eed5fa28a35f03424253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 03:55:47 +00:00
Treehugger Robot
02f6f002a4 Merge "Handle errors corrected exit status returned by fsck" into main am: 81ed259a35 am: 963b84c497 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2651499

Change-Id: I3b1feded497085430a6a6e6cb702dc0cb5721577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 03:06:05 +00:00
Treehugger Robot
963b84c497 Merge "Handle errors corrected exit status returned by fsck" into main am: 81ed259a35 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2651499

Change-Id: I31ecc8519bd6b450c70353ad6ba18e7ef378d7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 02:13:14 +00:00
Treehugger Robot
81ed259a35 Merge "Handle errors corrected exit status returned by fsck" into main 2023-09-12 01:03:08 +00:00
Pawan Wagh
21d3e5c7c3 Merge "Adding corpus for vold fuzzer" into main am: b6f66fd7b4 am: 063b03d410 am: 2ad726bac2 am: 1045f26549 am: 77bcabebd7 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2741033

Change-Id: I489415b361aed5381af2334d352959de8394485a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 10:56:08 +00:00
Pawan Wagh
77bcabebd7 Merge "Adding corpus for vold fuzzer" into main am: b6f66fd7b4 am: 063b03d410 am: 2ad726bac2 am: 1045f26549 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2741033

Change-Id: I5576d301e186392d8569246432a05db604a09843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 09:58:33 +00:00
Pawan Wagh
1045f26549 Merge "Adding corpus for vold fuzzer" into main am: b6f66fd7b4 am: 063b03d410 am: 2ad726bac2 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2741033

Change-Id: Id72f844e41b9ccb8be9b89b3a3ca0a055080786f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 09:21:52 +00:00
Pawan Wagh
2ad726bac2 Merge "Adding corpus for vold fuzzer" into main am: b6f66fd7b4 am: 063b03d410 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2741033

Change-Id: I019f6bcf7ad5c690e26d4350630b3a23751f55c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 08:34:30 +00:00
Pawan Wagh
063b03d410 Merge "Adding corpus for vold fuzzer" into main am: b6f66fd7b4 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2741033

Change-Id: Ic9d4b295db45c8b53dfc40454ef4a32b2cf2a9dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 07:42:26 +00:00
Pawan Wagh
b6f66fd7b4 Merge "Adding corpus for vold fuzzer" into main 2023-09-08 06:53:26 +00:00
Himanshu Gupta
94fe650a2f Merge "Adding public volume mounts for clone user." into main am: 4a8594b223 am: 8422dde06e am: 898e54bf6f am: eed782509b am: 4cff2ba65b 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2679182

Change-Id: I12805db65e8ec35ee3e628dc857a79c3ac1cb8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 14:03:21 +00:00
Himanshu Gupta
4cff2ba65b Merge "Adding public volume mounts for clone user." into main am: 4a8594b223 am: 8422dde06e am: 898e54bf6f am: eed782509b 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2679182

Change-Id: I934d70a9a782e703540198a1b74c698b4bca8fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 13:06:12 +00:00
Himanshu Gupta
eed782509b Merge "Adding public volume mounts for clone user." into main am: 4a8594b223 am: 8422dde06e am: 898e54bf6f 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2679182

Change-Id: I7fa707bfbc15a787ebabf0345ed219fdc2708cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 12:28:19 +00:00
Himanshu Gupta
898e54bf6f Merge "Adding public volume mounts for clone user." into main am: 4a8594b223 am: 8422dde06e 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2679182

Change-Id: Ib4092124328abf8e6d779dd2cb32b4d84d253057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 11:42:54 +00:00
Himanshu Gupta
8422dde06e Merge "Adding public volume mounts for clone user." into main am: 4a8594b223 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2679182

Change-Id: I1f1d9e598806a5fa143d8a745f95ebdf2dadab52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 10:49:20 +00:00
Himanshu Gupta
4a8594b223 Merge "Adding public volume mounts for clone user." into main 2023-09-07 10:13:05 +00:00
Pawan Wagh
efe3c891bd Adding corpus for vold fuzzer 
Generated corpus using binder2corpus tool from recordings
of vold transactions and using it with vold service fuzzer.

Test: m vold_native_service_fuzzer && adb sync data && adb shell /data/fuzz/arm64/vold_native_service_fuzzer/vold_native_service_fuzzer /data/fuzz/arm64/vold_native_service_fuzzer/vold_native_service_fuzzer_corpus -runs=1000
Bug: b/299138341
Change-Id: Ic9bc7a7971790fa19a04181b6f89a33a0088bdd8
 2023-09-06 21:20:16 +00:00
Paul Lawrence
c9516b322f [automerger skipped] Add vdc volume getStorageSize am: 29ab03668f -s ours am: 69e1dc2112 -s ours am: af7258d928 -s ours 
am skip reason: Merged-In I907892041b1ce2cd72092a9877ac34c12bf3f254 with SHA-1 d73dfd4ab0 is already in history

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

Change-Id: I2412348a6ffb34a6b7cf9dc8cbaefe72f7ed861e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 04:04:48 +00:00
Paul Lawrence
af7258d928 [automerger skipped] Add vdc volume getStorageSize am: 29ab03668f -s ours am: 69e1dc2112 -s ours 
am skip reason: Merged-In I907892041b1ce2cd72092a9877ac34c12bf3f254 with SHA-1 d73dfd4ab0 is already in history

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

Change-Id: I69888f967595278d392c11f973572f9349ca6e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 03:03:48 +00:00
Paul Lawrence
a23452b296 [automerger skipped] Add vdc volume getStorageSize am: 29ab03668f -s ours am: 8af0628dd5 -s ours am: aee28745f6 -s ours 
am skip reason: Merged-In I907892041b1ce2cd72092a9877ac34c12bf3f254 with SHA-1 24b7d2ddbc is already in history

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

Change-Id: I0816e2fe782ff4af3a41f93caae9772a753b42b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 02:31:08 +00:00
Daeho Jeong
a693bb375c Merge "Correct reserved blocks to segments" into main am: ab2b49bb74 am: 4922ef2616 am: b8db678950 am: 10987fcfd8 am: cee23aaa58 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2736813

Change-Id: Iece2f10615f18760ca2e8b79f7a6109b58ef7278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 02:30:57 +00:00
Paul Lawrence
69e1dc2112 [automerger skipped] Add vdc volume getStorageSize am: 29ab03668f -s ours 
am skip reason: Merged-In I907892041b1ce2cd72092a9877ac34c12bf3f254 with SHA-1 d73dfd4ab0 is already in history

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

Change-Id: I8b99a9e9b0ffe9abd10de2f0de85484dd30fc253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 02:26:52 +00:00
Paul Lawrence
aee28745f6 [automerger skipped] Add vdc volume getStorageSize am: 29ab03668f -s ours am: 8af0628dd5 -s ours 
am skip reason: Merged-In I907892041b1ce2cd72092a9877ac34c12bf3f254 with SHA-1 24b7d2ddbc is already in history

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

Change-Id: I005e2eb793b269b63f01bf119f01a87f540a76f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 02:22:28 +00:00
Paul Lawrence
8af0628dd5 [automerger skipped] Add vdc volume getStorageSize am: 29ab03668f -s ours 
am skip reason: Merged-In I907892041b1ce2cd72092a9877ac34c12bf3f254 with SHA-1 24b7d2ddbc is already in history

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

Change-Id: I27d649fec3e49767da5b95a75ea0d0a8f00d9506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 02:17:36 +00:00
Daeho Jeong
cee23aaa58 Merge "Correct reserved blocks to segments" into main am: ab2b49bb74 am: 4922ef2616 am: b8db678950 am: 10987fcfd8 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2736813

Change-Id: I87e86b43bf430fed5e7d586eb5e6b48798550627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 02:13:33 +00:00
Daeho Jeong
10987fcfd8 Merge "Correct reserved blocks to segments" into main am: ab2b49bb74 am: 4922ef2616 am: b8db678950 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2736813

Change-Id: I07bcec0f59c9889564f0d38acd293e9c46858173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 01:35:48 +00:00
Daeho Jeong
b8db678950 Merge "Correct reserved blocks to segments" into main am: ab2b49bb74 am: 4922ef2616 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2736813

Change-Id: I9b8546b7315c384b7d17336765fc438bb37a1c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 00:47:27 +00:00
Daeho Jeong
4922ef2616 Merge "Correct reserved blocks to segments" into main am: ab2b49bb74 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2736813

Change-Id: If2eed3d67a9b1250b99a02b1d1043e0f24e223cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 23:53:45 +00:00
Daeho Jeong
ab2b49bb74 Merge "Correct reserved blocks to segments" into main 2023-08-31 22:46:23 +00:00
Daeho Jeong
b868a88c1a Correct reserved blocks to segments 
Align units to a segment unit when adjusting free segment number.

Test: run the smart idle maint service.
Change-Id: I4fd74ac92adc4ae1a0ded4a7df75a690d829eb20
Signed-off-by: Daeho Jeong <daehojeong@google.com>
 2023-08-31 12:54:01 -07:00
Jooyung Han
7a762d667b Merge "Do not read ro.apex.updatable." into main am: 170f15bb4c am: d592cd545b am: 7cf408faef am: 083b92b639 am: 06a9f432a9 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2727653

Change-Id: I31dc2e3a6a725237f57b8ee1da00be3e1fea3229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 05:49:27 +00:00
Jooyung Han
06a9f432a9 Merge "Do not read ro.apex.updatable." into main am: 170f15bb4c am: d592cd545b am: 7cf408faef am: 083b92b639 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2727653

Change-Id: I7679e5035393176549287c51399bbff9aea73137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 04:50:12 +00:00
Jooyung Han
083b92b639 Merge "Do not read ro.apex.updatable." into main am: 170f15bb4c am: d592cd545b am: 7cf408faef 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2727653

Change-Id: I1b1bd3e6b54b5271c95239702f00f468068d25b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 04:13:47 +00:00
Jooyung Han
7cf408faef Merge "Do not read ro.apex.updatable." into main am: 170f15bb4c am: d592cd545b 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2727653

Change-Id: I2a2f093d588df4677306501f53bddaeb741bf9fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 03:26:35 +00:00
Jooyung Han
d592cd545b Merge "Do not read ro.apex.updatable." into main am: 170f15bb4c 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2727653

Change-Id: I1bfea3565d290b6723c1d8727fbfd748d91a43c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 02:35:21 +00:00