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
Jooyung Han
170f15bb4c Merge "Do not read ro.apex.updatable." into main 2023-08-31 01:11:11 +00:00
Paul Lawrence
29ab03668f Add vdc volume getStorageSize 
StorageStatsManager.getTotalBytes currently takes the size of /data and
rounds up to known probable sizes to guess the size of internal storage.
This is not always correct.

Instead, find the device /data is on and get the size of that device.
This should give a more accurate answer.

Bug: 295358118
Test: vdc volume getStorageSize returns storage size
(cherry picked from https://android-review.googlesource.com/q/commit:d73dfd4ab0ff4cbf704034750b2a25832da7fb0c)
Merged-In: I907892041b1ce2cd72092a9877ac34c12bf3f254
Change-Id: I907892041b1ce2cd72092a9877ac34c12bf3f254
(cherry picked from commit 24b7d2ddbc)
 2023-08-30 14:25:40 +00:00
Xin Li
91ee667f74 [automerger skipped] Merge Android U (ab/10368041) am: e737fd0a43 -s ours am: 90bb88c1e7 -s ours am: e4a4bf032b -s ours am: db7f508b30 -s ours 
am skip reason: Merged-In Idda5d816c2a012afa35658f1b2d86ae2787c1faf with SHA-1 4801c65d8e is already in history

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

Change-Id: I9defc4c3661a70d77b49bd3f84b9355005d33085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 20:38:06 +00:00
himanshuz
0ad0862159 Adding public volume mounts for clone user. 
Public SdCard Volumes are mounted only for user 0
(foreground user). This gives ENONT if the cloned
user tries to access the files in SdCard with
paths like "/storage/AB02-G212/DCIM/"

This change adds SdCard Volume mnt under
/mnt/usr/<cloned-user>/ which allows cloned apps
access to SdCard via direct file paths.

Bug: 203395175
Test: Manual by building and flashing device.
Change-Id: I091c40d3cb19915145cd5af40d1e79d5a9ecfa02
 2023-08-29 10:38:43 +00:00
Xin Li
db7f508b30 [automerger skipped] Merge Android U (ab/10368041) am: e737fd0a43 -s ours am: 90bb88c1e7 -s ours am: e4a4bf032b -s ours 
am skip reason: Merged-In Idda5d816c2a012afa35658f1b2d86ae2787c1faf with SHA-1 4801c65d8e is already in history

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

Change-Id: Ic8c7f5dd6a0c589f50674de38cb45ff23bb3f5e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:10:59 +00:00
Xin Li
e4a4bf032b [automerger skipped] Merge Android U (ab/10368041) am: e737fd0a43 -s ours am: 90bb88c1e7 -s ours 
am skip reason: Merged-In Idda5d816c2a012afa35658f1b2d86ae2787c1faf with SHA-1 4801c65d8e is already in history

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

Change-Id: I7ccfccdd849307e059bc7824dad2f184ab9adf0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:35:16 +00:00
Xin Li
90bb88c1e7 [automerger skipped] Merge Android U (ab/10368041) am: e737fd0a43 -s ours 
am skip reason: Merged-In Idda5d816c2a012afa35658f1b2d86ae2787c1faf with SHA-1 4801c65d8e is already in history

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

Change-Id: I38e90fd338d854710e48e26efc4c695c1a0d1ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:59:17 +00:00
Jooyung Han
a9f2171c42 Do not read ro.apex.updatable. 
We no longer support ro.apex.updatable=false case. Hence no need to read
it.

Bug: 297460439
Test: device boots
Change-Id: I9b71ea96052741073f092ca6abcfbe92a927128a
 2023-08-25 15:38:12 +09:00
Xin Li
e737fd0a43 Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: Idda5d816c2a012afa35658f1b2d86ae2787c1faf
Change-Id: I9be9d1ad2b5b186bb8276263b3b42297ebfa332f
 2023-08-17 16:51:54 -07:00
Paul Lawrence
7445e3f94f [automerger skipped] Add vdc volume getStorageSize am: 24b7d2ddbc -s ours am: 08aaa349c5 -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/+/24432931

Change-Id: Id6b4be1d02060dc0444ba7226a77f5133acb9283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 12:00:43 +00:00
Paul Lawrence
08aaa349c5 [automerger skipped] Add vdc volume getStorageSize am: 24b7d2ddbc -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/+/24432931

Change-Id: I64d0ce059cc2f6f01fc6ebfda711f7ede2d92f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-16 11:14:34 +00:00
Paul Lawrence
7f23bc4ac1 Merge "Add vdc volume getStorageSize" into main am: f05039392c am: 0923cc69d7 am: 0a2095edca am: d0519478ae am: cfb1bfeaf8 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2706217

Change-Id: Ie5e077c61889e732148da83d6e60ccbc26e8436d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 18:29:35 +00:00
Paul Lawrence
cfb1bfeaf8 Merge "Add vdc volume getStorageSize" into main am: f05039392c am: 0923cc69d7 am: 0a2095edca am: d0519478ae 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2706217

Change-Id: I0ed64655f2e7223d65a7528a67fc2ada38ad924a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 17:46:49 +00:00
Paul Lawrence
d0519478ae Merge "Add vdc volume getStorageSize" into main am: f05039392c am: 0923cc69d7 am: 0a2095edca 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2706217

Change-Id: Ib51e6d9695953cb2974a8301b7f6da8ed87e6eea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 17:03:08 +00:00
Paul Lawrence
0a2095edca Merge "Add vdc volume getStorageSize" into main am: f05039392c am: 0923cc69d7 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2706217

Change-Id: Ic5551d2aec02a9a588c748f1800a9959bf72f625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 16:16:49 +00:00
Paul Lawrence
24b7d2ddbc Add vdc volume getStorageSize 
StorageStatsManager.getTotalBytes currently takes the size of /data and
rounds up to known probable sizes to guess the size of internal storage.
This is not always correct.

Instead, find the device /data is on and get the size of that device.
This should give a more accurate answer.

Bug: 295358118
Test: vdc volume getStorageSize returns storage size
(cherry picked from https://android-review.googlesource.com/q/commit:d73dfd4ab0ff4cbf704034750b2a25832da7fb0c)
Merged-In: I907892041b1ce2cd72092a9877ac34c12bf3f254
Change-Id: I907892041b1ce2cd72092a9877ac34c12bf3f254
 2023-08-15 15:44:56 +00:00
Paul Lawrence
0923cc69d7 Merge "Add vdc volume getStorageSize" into main am: f05039392c 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2706217

Change-Id: I82ad84f8b63fb5f9204a35e1940cb9a77d45bc23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 15:36:27 +00:00
Paul Lawrence
f05039392c Merge "Add vdc volume getStorageSize" into main 2023-08-15 14:51:08 +00:00
Eric Biggers
c971c05a04 Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main am: 50e681b4ba am: 59e7388536 am: 579643b765 am: 298770c2cf am: 67039df9c9 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705760

Change-Id: I44723626fb3dff19b459cbcc5d7e813b36c03967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 03:40:56 +00:00
Eric Biggers
67039df9c9 Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main am: 50e681b4ba am: 59e7388536 am: 579643b765 am: 298770c2cf 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705760

Change-Id: If33cd86c907217b773ec2f800fae55d7e0685297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 02:54:18 +00:00
Eric Biggers
298770c2cf Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main am: 50e681b4ba am: 59e7388536 am: 579643b765 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705760

Change-Id: Ie58b63a6a68bbea912f61bc0e5d670ab4b0d54af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 02:09:29 +00:00
Eric Biggers
579643b765 Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main am: 50e681b4ba am: 59e7388536 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705760

Change-Id: I922242eeb193b924e8f242f954d1935f9cafd749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 01:25:18 +00:00
Eric Biggers
59e7388536 Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main am: 50e681b4ba 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705760

Change-Id: I2ed5f6e758fc48bc842c05652c8c002edaae991a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-15 00:44:25 +00:00
Paul Lawrence
d73dfd4ab0 Add vdc volume getStorageSize 
StorageStatsManager.getTotalBytes currently takes the size of /data and
rounds up to known probable sizes to guess the size of internal storage.
This is not always correct.

Instead, find the device /data is on and get the size of that device.
This should give a more accurate answer.

Bug: 295358118
Test: vdc volume getStorageSize returns storage size
Change-Id: I907892041b1ce2cd72092a9877ac34c12bf3f254
 2023-08-14 23:51:39 +00:00
Eric Biggers
50e681b4ba Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main 2023-08-14 20:54:30 +00:00
Jooyung Han
4f91b5c39f Merge changes from topic "revert-2685449-apexdata-dirs-NPLMAAVHNV" into main am: 866faf55e3 am: 6d57d3a9fa am: 0e013cf720 am: 120a8bcbc6 am: 4c6bacf224 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705735

Change-Id: If3964ac345ced7a5ab9574e708f29b0af8deb76e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-12 02:28:17 +00:00
Tomasz Wasilczyk
2c6d11a7d4 Merge "Use String8/16 c_str" into main am: 920fe9b065 am: affd3c30cc am: dc0c9884bc am: b18a6b8e88 am: 389c690708 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705933

Change-Id: I5167cda3d53e40809f7ad863ab96c10550bf1962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-12 02:27:57 +00:00
Jooyung Han
4c6bacf224 Merge changes from topic "revert-2685449-apexdata-dirs-NPLMAAVHNV" into main am: 866faf55e3 am: 6d57d3a9fa am: 0e013cf720 am: 120a8bcbc6 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705735

Change-Id: I05c1bf89b360b7beff0221ba3e8190a41603eaa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-12 01:45:55 +00:00
Tomasz Wasilczyk
389c690708 Merge "Use String8/16 c_str" into main am: 920fe9b065 am: affd3c30cc am: dc0c9884bc am: b18a6b8e88 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705933

Change-Id: I66211fd8146d81ec595ea02629cc1d8ec4bbfffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-12 01:45:08 +00:00
Jooyung Han
120a8bcbc6 Merge changes from topic "revert-2685449-apexdata-dirs-NPLMAAVHNV" into main am: 866faf55e3 am: 6d57d3a9fa am: 0e013cf720 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705735

Change-Id: I2bfd1cdfa4b3ca9aef2a507c05899fce0ef7b5ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-12 01:00:02 +00:00
Tomasz Wasilczyk
b18a6b8e88 Merge "Use String8/16 c_str" into main am: 920fe9b065 am: affd3c30cc am: dc0c9884bc 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705933

Change-Id: Ie59d8aab3092a3d2e938354a66cf92378c3505b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-12 00:59:46 +00:00
Jooyung Han
0e013cf720 Merge changes from topic "revert-2685449-apexdata-dirs-NPLMAAVHNV" into main am: 866faf55e3 am: 6d57d3a9fa 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705735

Change-Id: Ia4b693cff865fc380f157ec6ec4cea7d672bcad7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-12 00:15:58 +00:00
Tomasz Wasilczyk
dc0c9884bc Merge "Use String8/16 c_str" into main am: 920fe9b065 am: affd3c30cc 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705933

Change-Id: I6af82f1be61dc38aceaa8b3f738bd3784cc39ca3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-12 00:15:29 +00:00
Jooyung Han
6d57d3a9fa Merge changes from topic "revert-2685449-apexdata-dirs-NPLMAAVHNV" into main am: 866faf55e3 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705735

Change-Id: I074c6b9bc82169bc4ce611bd4bf2aacd63816f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 23:34:11 +00:00
Tomasz Wasilczyk
affd3c30cc Merge "Use String8/16 c_str" into main am: 920fe9b065 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705933

Change-Id: I44bd263aab55b4a1c9b73215a1719e02dbc6cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-11 23:33:01 +00:00
Jooyung Han
866faf55e3 Merge changes from topic "revert-2685449-apexdata-dirs-NPLMAAVHNV" into main 
* changes:
  Use /data/misc/apexdata for the list of APEXes
  Revert "Use apexservice to get the list of apexes"
 2023-08-11 23:23:18 +00:00
Tomasz Wasilczyk
920fe9b065 Merge "Use String8/16 c_str" into main 2023-08-11 22:56:12 +00:00
Eric Biggers
2114e26501 Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" 
This reverts commit 78f806198f.

There is no code that reads this system property, logcat already shows
whether the FS keyring is being used, and all devices launching with
Android 11 and later are guaranteed to use the FS keyring anyway.

Bug: 154327249
Change-Id: Id906efedd89d5bcac5370fb141cdbf7848932d95
 2023-08-11 20:27:44 +00:00
Tomasz Wasilczyk
fa1b3971fd Use String8/16 c_str 
Bug: 295394788
Test: make checkbuild
Change-Id: I6029b226006c4e82849411adfe539d5c43763e18
 2023-08-11 16:12:17 +00:00
Jooyung Han
64d727c503 Use /data/misc/apexdata for the list of APEXes 
vold_prepare_subdirs should create apexdata directories for each APEX.
Previously, it gets the list by scanning /apex directory. However,
vold/vold_prepare_subdirs run in the bootstrap mount namespace, they can
see only bootstrap apexes in /apex. The reason why it worked was that
unintended side effects of how we managed /apex directory for both mount
namespace.

Instead, since apexdata directories are already populated by init in
/data/misc/apexdata, we can use that directory for the same purpose.

Bug: 295345486
Test: CtsPackageSettingHostTestCases
Change-Id: I453cd59f54ccbb140f73b5e8576b36fa49f9bc59
 2023-08-12 01:05:53 +09:00
Eric Biggers
b61fd2a000 Merge "Revert "fskeyring & userspace reboot: support CE keys"" into main 2023-08-11 15:53:33 +00:00
Jooyung Han
6d07925510 Revert "Use apexservice to get the list of apexes" 
Revert submission 2685449-apexdata-dirs

Reason for revert: b/295345486 performance regression.

Reverted changes: /q/submissionid:2685449-apexdata-dirs

Bug: b/295345486
Test: n/a
Change-Id: I710a416398148b544635e32e6b8066fb0560171f
 2023-08-12 00:45:30 +09:00
Jooyung Han
fc90273b18 Merge "Use apexservice to get the list of apexes" into main am: d54caf0598 am: f10ff3ad79 am: 7dcb194604 am: 2d4b7ed3fb am: e309b641af 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2685449

Change-Id: I31f2945d48e26c73b1f192020ea8332a7bcdd738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 10:07:40 +00:00
Jooyung Han
e309b641af Merge "Use apexservice to get the list of apexes" into main am: d54caf0598 am: f10ff3ad79 am: 7dcb194604 am: 2d4b7ed3fb 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2685449

Change-Id: I35f4e7e0a69d8ca76f5d935db499a7514273cc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 09:24:03 +00:00
Jooyung Han
2d4b7ed3fb Merge "Use apexservice to get the list of apexes" into main am: d54caf0598 am: f10ff3ad79 am: 7dcb194604 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2685449

Change-Id: I0c94b76c1a6dfc035ba6ec806df9bba8d881cd5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 08:40:23 +00:00
Jooyung Han
7dcb194604 Merge "Use apexservice to get the list of apexes" into main am: d54caf0598 am: f10ff3ad79 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2685449

Change-Id: I2e36ea173f0703c08c63da05ace2d6b17b7c42aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 07:56:49 +00:00
Jooyung Han
f10ff3ad79 Merge "Use apexservice to get the list of apexes" into main am: d54caf0598 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2685449

Change-Id: I53d9757abead3b69e832bc906b7bf747399f8180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-09 07:15:45 +00:00
Jooyung Han
d54caf0598 Merge "Use apexservice to get the list of apexes" into main 2023-08-09 06:37:02 +00:00
Eric Biggers
2b97a88ba4 Revert "fskeyring & userspace reboot: support CE keys" 
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
Ignore-AOSP-First: Conflicts. Will cherry-pick after Android 14 push...
Change-Id: If530edaf7c1566dd3bd8b1322f935f38a2e66beb
 2023-08-07 19:48:05 +00:00
David Anderson
3b1e1fe3d8 Merge "vold: fix idlemaint abort may hold the wakelock" into main am: 1d0290c4fb am: ba9097a253 am: fb17820f1e am: 8e4fa8dd82 am: 82c24af55b 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2672655

Change-Id: I78839a0d056263e00f3d1fdb7cf4962ba1c3025b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 02:05:45 +00:00