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

5148 commits

This branch
This branch
All branches
Author SHA1 Message Date
Xin Li
dd850f5d4c [automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65f8 -s ours am: 8f933c71e0 -s ours am: 76ff4f2267 -s ours 
am skip reason: Merged-In Id6edfe90aadae4db1b23c5bc0de4981170ba42f2 with SHA-1 344c737ba0 is already in history

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

Change-Id: I1c13c602c77eac48d8c77490d6088de1d44a4f0d
 2021-12-14 21:50:53 +00:00
Xin Li
76ff4f2267 [automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65f8 -s ours am: 8f933c71e0 -s ours 
am skip reason: Merged-In Id6edfe90aadae4db1b23c5bc0de4981170ba42f2 with SHA-1 344c737ba0 is already in history

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

Change-Id: Ib3e921b8916d37ff10d7cf9adfd40ab2981d7a10
 2021-12-14 21:23:59 +00:00
Xin Li
8f933c71e0 [automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65f8 -s ours 
am skip reason: Merged-In Id6edfe90aadae4db1b23c5bc0de4981170ba42f2 with SHA-1 344c737ba0 is already in history

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

Change-Id: Ica0e7ec4c9d28da3832d587604d0ff5a097050f2
 2021-12-14 21:00:09 +00:00
Xin Li
235d1d65f8 Merge "Merge Android 12 QPR1" 2021-12-14 20:25:23 +00:00
Xin Li
721a879cfe Merge Android 12 QPR1 
Bug: 210511427
Merged-In: Id6edfe90aadae4db1b23c5bc0de4981170ba42f2
Change-Id: Ic9e9149ae767b55c33b100586dfcb5790c862bbf
 2021-12-14 08:39:19 -08:00
Treehugger Robot
c9bb1e5290 Merge "Remove StubVolume disks upon vold reset events" am: e8d0e486a3 am: 344c737ba0 am: 7e3abf6c3e 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1902674

Change-Id: I945518919facfb1aec58f297feaedef816062ecc
 2021-12-08 09:08:46 +00:00
Treehugger Robot
7e3abf6c3e Merge "Remove StubVolume disks upon vold reset events" am: e8d0e486a3 am: 344c737ba0 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1902674

Change-Id: I0c076a1a44b605585feeb5781ed87f755ebdcd68
 2021-12-08 08:58:01 +00:00
Treehugger Robot
344c737ba0 Merge "Remove StubVolume disks upon vold reset events" am: e8d0e486a3 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1902674

Change-Id: Id6edfe90aadae4db1b23c5bc0de4981170ba42f2
 2021-12-08 08:43:32 +00:00
Treehugger Robot
e8d0e486a3 Merge "Remove StubVolume disks upon vold reset events" 2021-12-08 08:25:46 +00:00
Youkichi Hosoi
dfaff1dc15 Remove StubVolume disks upon vold reset events 
StubVolumes are managed from outside Android (e.g. from Chrome OS). So,
their disk recreation on vold reset events should also be handled from
outside by 1) listening to reset events, and 2) calling
createStubVolume() for existing StubVolumes on reset events.

Bug: 175281783
Test: m
Test: (Tested in R) Manually induce a vold reset event, and confirm that
Test: 1) vold does not crash, and 2) existing volumes are successfully
Test: mounted again (by calling createStubVolume() for StubVolumes).
Change-Id: I4628eabf809037a547aeef43faedf4dfa57529a6
 2021-12-08 09:37:53 +09:00
Treehugger Robot
050a7ed6ec Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7 am: 64a5600c83 am: 190b5fb47a 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1906281

Change-Id: I3a986fe14e69b6f94f86962574198d6b3dc358da
 2021-12-07 18:47:58 +00:00
Treehugger Robot
190b5fb47a Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7 am: 64a5600c83 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1906281

Change-Id: I136d349b3f29b924f61d7739ded7616dcaa16c72
 2021-12-07 18:36:49 +00:00
Treehugger Robot
64a5600c83 Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1906281

Change-Id: I6383e6a45086539103bae5f19369532733d4aec5
 2021-12-07 18:21:50 +00:00
Treehugger Robot
b9f8c322c7 Merge "Depend on Keystore2 AIDL via default" 2021-12-07 18:08:13 +00:00
Treehugger Robot
ccd2d0687c Merge "Disable bind mounts for data and obb if FUSE BPF is available" am: b9f8aefbb9 am: f0bde5767c am: be440e1227 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1907695

Change-Id: Ie095a81f8125f0d875c32b66d8f37c86f49764f6
 2021-12-02 21:10:33 +00:00
Treehugger Robot
be440e1227 Merge "Disable bind mounts for data and obb if FUSE BPF is available" am: b9f8aefbb9 am: f0bde5767c 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1907695

Change-Id: I18dd4137d5140765bd3607e8ca7aa5fd0d403154
 2021-12-02 20:50:12 +00:00
Treehugger Robot
f0bde5767c Merge "Disable bind mounts for data and obb if FUSE BPF is available" am: b9f8aefbb9 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1907695

Change-Id: I6867f9941c2e98023999b11edf5d0e2f67949840
 2021-12-02 20:34:59 +00:00
Treehugger Robot
b9f8aefbb9 Merge "Disable bind mounts for data and obb if FUSE BPF is available" 2021-12-02 19:54:26 +00:00
Alessio Balsini
dd1e91ff58 Disable bind mounts for data and obb if FUSE BPF is available 
FUSE BPF aims at achieving comparable performance to bind-mounts, with
the flexibility of FUSE.
Disable data and obb bind-mounts in favor of the FUSE filesystem if the
system implements the feature.

Bug: 202785178
Test: mount | grep obb
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: Ia8b289b84542125831a857b559bb6f93afbee494
 2021-12-02 18:35:17 +00:00
David Drysdale
4babbc78d5 Depend on Keystore2 AIDL via default 
This allows for easier bumping of the KeyMint/Keystore2 version level.

At the moment this change should have no effect: the same dependency
is used, just reached via a default rather than explicitly.

However, when the Keystore2 version increases in the near future, using
this default should mean that no change is needed here: the default
definition will change to -V2 and this will be referenced here.

Test: TreeHugger
Change-Id: I7cec2cd8fac137e5ac7e95db06e738e94a3cc567
 2021-12-01 09:56:48 +00:00
Paul Lawrence
94e2868455 Merge "Add dependency for vold on fuse_media.o" am: e9c951590e am: cca6366ead am: eee31e408b 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1894199

Change-Id: Ic6ea313820273c2d5ce7ff8c87846f72616e0e18
 2021-11-29 16:58:45 +00:00
Paul Lawrence
eee31e408b Merge "Add dependency for vold on fuse_media.o" am: e9c951590e am: cca6366ead 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1894199

Change-Id: Id43b3546ef41639ba864fb2792af844eff3e6347
 2021-11-29 16:45:03 +00:00
Paul Lawrence
cca6366ead Merge "Add dependency for vold on fuse_media.o" am: e9c951590e 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1894199

Change-Id: I0578842564cc92860548f895498c7e852e853166
 2021-11-29 16:33:03 +00:00
Paul Lawrence
e9c951590e Merge "Add dependency for vold on fuse_media.o" 2021-11-29 16:18:42 +00:00
Treehugger Robot
ef8924f46d Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" am: bddb449182 am: 6e9d37542f am: b43b71a2bc 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1891635

Change-Id: I9425ea87c9c57ba9ac7dcc4376cf86f931557d00
 2021-11-26 03:58:30 +00:00
Treehugger Robot
b43b71a2bc Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" am: bddb449182 am: 6e9d37542f 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1891635

Change-Id: I5e3410dfe59791b003b6387a64e228b5945a99a5
 2021-11-26 03:41:28 +00:00
Treehugger Robot
6e9d37542f Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" am: bddb449182 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1891635

Change-Id: I9b8c755cacecd71598ec48ac5d009a0aa728e3de
 2021-11-26 03:23:23 +00:00
Treehugger Robot
bddb449182 Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" 2021-11-26 03:02:16 +00:00
Youkichi Hosoi
2991cbe49f Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE} 
IVold.MOUNT_FLAG_VISIBLE is split into MOUNT_FLAG_VISIBLE_FOR_READ and
MOUNT_FLAG_VISIBLE_FOR_WRITE.
Accordingly, VolumeBase::MountFlags::kVisible is split into
kVisibleForRead and kVisibleForWrite.

Bug: 206019156
Test: m
Change-Id: Ia55673400d9f713f221650e1335a46ba11f6f027
Merged-In: Ia55673400d9f713f221650e1335a46ba11f6f027
 2021-11-25 13:04:45 +09:00
Eric Biggers
6221c50e95 Merge "Allow IV_INO_LBLK_32 with virtio storage" am: 660f052858 am: 56e5978547 am: 9fc74e7614 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1899590

Change-Id: Ie08f47b57100d7194c4a2d42e9ebfa81d261b6f6
 2021-11-23 19:50:32 +00:00
Eric Biggers
9fc74e7614 Merge "Allow IV_INO_LBLK_32 with virtio storage" am: 660f052858 am: 56e5978547 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1899590

Change-Id: I6817ee46e6dc6ba84dd7fbfc89bccf82819e4eec
 2021-11-23 19:33:22 +00:00
Eric Biggers
56e5978547 Merge "Allow IV_INO_LBLK_32 with virtio storage" am: 660f052858 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1899590

Change-Id: Iada10c8ad80a70a039354e8321153c0cad4bd785
 2021-11-23 19:10:20 +00:00
Eric Biggers
660f052858 Merge "Allow IV_INO_LBLK_32 with virtio storage" 2021-11-23 18:48:11 +00:00
Eric Biggers
f9c6dfa8fd Allow IV_INO_LBLK_32 with virtio storage 
This has to be allowed as a workaround until there is a way for
userspace to check the maximum DUN size directly.

Bug: 207390665
Change-Id: Id5e51720ca963fe80e65dbae1965f777b3cd2ee4
 2021-11-22 11:33:39 -08:00
Xin Li
1acd8a9306 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: d756848928 -s ours am: 0c981040de -s ours 
am skip reason: Merged-In I026ad515c20a042f87d3ce580c28745e68c0f939 with SHA-1 b6c257d37f is already in history

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

Change-Id: I19e0995b13822cae094a9c4b75ccf6d6a5953526
 2021-11-18 22:25:11 +00:00
Xin Li
0c981040de [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: d756848928 -s ours 
am skip reason: Merged-In I026ad515c20a042f87d3ce580c28745e68c0f939 with SHA-1 b6c257d37f is already in history

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

Change-Id: I789da306f7ef9dd5f9323d89887bc398ad1fbe74
 2021-11-18 22:00:54 +00:00
Xin Li
d756848928 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 21:29:02 +00:00
Paul Lawrence
5defbf9607 Add dependency for vold on fuse_media.o 
Ensure fuse_media gets included in every build

Bug: 202785178
Test: /system/etc/bpf/fuse_media.o is present

Change-Id: Ic9f88a1905eca66f67b94ce75a04b9b26b6ca7ca
 2021-11-16 19:49:44 +00:00
Keith Mok
356b107b73 [automerger skipped] Merge "vold: Reboot if vold failure" into sc-v2-dev am: 1d49ec7aab -s ours 
am skip reason: Merged-In Ic56acd9cc906b0166adf805023e34bbd6b3648a5 with SHA-1 c73dbac02d is already in history

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

Change-Id: I9655fc85e5f27503ac1c9c6fb1b9c2857b96e2b8
 2021-11-12 23:01:53 +00:00
Keith Mok
1d49ec7aab Merge "vold: Reboot if vold failure" into sc-v2-dev 2021-11-12 22:48:55 +00:00
Eric Biggers
01f990fa47 Merge changes Icdff584e,I71fd98e6,If1e9e3ad,I05bc4dc9 am: 017e95fa6a am: 078a507c43 am: 54dd37692a 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1887522

Change-Id: I6fbf578a3572365b31b70b336242884317e616f9
 2021-11-11 22:13:55 +00:00
Eric Biggers
54dd37692a Merge changes Icdff584e,I71fd98e6,If1e9e3ad,I05bc4dc9 am: 017e95fa6a am: 078a507c43 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1887522

Change-Id: I6e2144b19a38d838595729b932d7bd3a9110b87e
 2021-11-11 21:49:56 +00:00
Eric Biggers
078a507c43 Merge changes Icdff584e,I71fd98e6,If1e9e3ad,I05bc4dc9 am: 017e95fa6a 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1887522

Change-Id: If1d52fea241fa0732f4e1964f616a6e0c57b7303
 2021-11-11 21:38:43 +00:00
Eric Biggers
017e95fa6a Merge changes Icdff584e,I71fd98e6,If1e9e3ad,I05bc4dc9 
* changes:
  Remove vdc.rc
  Remove IgnoreEarlyBootEnded()
  Remove CRYPT_FOOTER_OFFSET
  Remove scrypt-related code
 2021-11-11 21:21:32 +00:00
Eric Biggers
d89e239c56 Remove vdc.rc 
Now that FDE is no longer supported, the "defaultcrypto" and "encrypt"
events are never triggered.  Therefore, the actions in vdc.rc aren't
needed anymore.

Bug: 191796797
Change-Id: Icdff584ec664b3e038f0accdc826437d261fed51
 2021-11-10 14:03:48 -08:00
Eric Biggers
72ca0cf3f9 Remove IgnoreEarlyBootEnded() 
Now that FDE is no longer supported, this is no longer needed.

Bug: 191796797
Change-Id: I71fd98e66fd0998b78b8d56507cc62e1a112263a
 2021-11-10 14:03:48 -08:00
Eric Biggers
230d664e08 Remove CRYPT_FOOTER_OFFSET 
This is no longer used.

Bug: 191796797
Change-Id: If1e9e3ad255714c37a8c1f292823f181eab7a1ce
 2021-11-10 14:03:48 -08:00
Eric Biggers
7c111e4529 Remove scrypt-related code 
This is no longer used.

Bug: 191796797
Change-Id: I05bc4dc9c25c050ace49606981c4f4db3d76f401
 2021-11-10 13:27:53 -08:00
Eric Biggers
655f36ee0f Merge "Remove most of FDE support" am: a70c666688 am: 650828aabf am: d7a58896a2 am: d2769a436c 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1875760

Change-Id: I0d1fb1b5a01a7c2a5a15a7ebb3b98425756203fd
 2021-11-10 20:17:17 +00:00
Eric Biggers
d2769a436c Merge "Remove most of FDE support" am: a70c666688 am: 650828aabf am: d7a58896a2 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1875760

Change-Id: Id5d3cb85951ae5b2bceca4e586897303d9c2344f
 2021-11-10 19:41:09 +00:00