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
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
Jooyung Han
170f15bb4c
Merge "Do not read ro.apex.updatable." into main
2023-08-31 01:11:11 +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
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
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
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
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
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
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
David Anderson
82c24af55b
Merge "vold: fix idlemaint abort may hold the wakelock" into main am: 1d0290c4fb
am: ba9097a253
am: fb17820f1e
am: 8e4fa8dd82
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2672655
Change-Id: Ic0da7f4d7813be897f71ddaa50376afb8f7e9a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 01:19:51 +00:00
David Anderson
8e4fa8dd82
Merge "vold: fix idlemaint abort may hold the wakelock" into main am: 1d0290c4fb
am: ba9097a253
am: fb17820f1e
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2672655
Change-Id: I0c2eb456aa45bfe42e025b2e230aafe931082de4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 00:34:27 +00:00