summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-05Merge "Enable vold to set level from user."Alan Stokes
2020-10-02Enable vold to set level from user.Alan Stokes
We want various per-user directories to have their SELinux MLS level set to restrict access from other users, as an improvement to user isolation. We extend vold_prepare_subdirs to implement this if a flag is set. vold itself then sets the flag based on a new property, ro.vold.level_from_user. This is to allow testing of further incremental work to ensure system apps correctly handle the new restriction on different devices rather than causing immediate breakage. Eventually this will go away and the restriction will apply everywhere. Bug: 141677108 Test: Manual, with and without propery set. Change-Id: I8e2207bd94b487bdcc09fd4d80b031027dfea1e3
2020-09-24Merge "vold: remove unused stop() methods" am: d70e2b4ea9Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1434595 Change-Id: Ifb529e76791d98c76c549bfb93c5abcf4096e685
2020-09-24Merge "vold: remove unused stop() methods"Treehugger Robot
2020-09-23vold: remove unused stop() methodsEric Biggers
NetlinkManager::stop() and VolumeManager::stop() are never called, so remove them. Change-Id: I868aa2ad24066d2830816984afcc10000cbabad1
2020-09-21Merge "bench: Add fail-fast error path to inodeop_bench" am: 5a99d3cfbbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1429775 Change-Id: I6bd94ca9e8ec62660b716d319ae949cdc578f6a3
2020-09-21Merge "bench: Add fail-fast error path to inodeop_bench"Treehugger Robot
2020-09-18bench: Add fail-fast error path to inodeop_benchStefano Duo
If one of the repeated operations specified by a command fails, report the error to the user and don't export its metric. Test: Manual run on physical device Bug: 165903680 Signed-off-by: Stefano Duo <stefanoduo@google.com> Change-Id: I3a8caeb6d878b004d89e425bc166c8505fda938a
2020-09-16Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1427711 Change-Id: I0254ee7e493f98a78476f2e939884185b04d10c0
2020-09-16Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION"Treehugger Robot
2020-09-15vold: remove unused code for CONFIG_HW_DISK_ENCRYPTIONEric Biggers
Nothing defines CONFIG_HW_DISK_ENCRYPTION, so remove the unused code that's conditional on it being defined. Change-Id: Ie435e138686eb4eac47d9aa762ae06f1645a117f
2020-09-15Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard" am: c5ff520a01Daeho Jeong
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1420895 Change-Id: I84cf17d8dd07c72a67beba46a814f51969a159ac
2020-09-14Merge "secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discard"Daeho Jeong
2020-09-14secdiscard: use F2FS_IOC_SEC_TRIM_FILE for secure discardDaeho Jeong
A new interface, F2FS_IOC_SEC_TRIM_FILE, has been added to F2FS filesystem to send secure discard command to a specific file, not to block device. We can use this interface for better discard command handling on a file basis. [how to use F2FS_IOC_SEC_TRIM_FILE] start: start offset in byte (should be aligned with 4096) len: length in byte (should be aligned with 4096, except designating EOF) -1 also means till EOF. flags: F2FS_TRIM_FILE_DISCARD - sending secure discard command. If the device doesn't support it, send normal discard. F2FS_TRIM_FILE_ZEROOUT - overwrite zero data in the file. Bug: 140759142 Test: execute "secdiscard -- <file_path>" and check the content of file Signed-off-by: Daeho Jeong <daehojeong@google.com> Change-Id: I6ee44a047d291274c9d70ae5e4ccccfc06a52f89
2020-09-11Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1400407 Change-Id: I44aea35571e4dff7f9f1010325f51d0e98dc01f1
2020-09-11Merge "Add '-unstable' to solve ODR violation"Treehugger Robot
2020-09-11Add '-unstable' to solve ODR violationJeongik Cha
The interface which is imported by an unstable interface is 'unstable' as well. Until now, the ODR violation checker in aidl has omitted an interface imported, but it will be checked, accordingly, fix the current problem Bug: 146436251 Test: m nothing Change-Id: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 Merged-In: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 Exempt-From-Owner-Approval: cp from internal
2020-09-11[automerger skipped] Merge "Merge Android R" am: 141c2027e2 -s oursXin Li
am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4ea6 is in history Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1422563 Change-Id: I78dff452b759e863b082f44b76fb5ae9a83cb704
2020-09-10Merge "Merge Android R"Xin Li
2020-09-09Merge Android RXin Li
Bug: 168057903 Merged-In: I477d2dfba05718c829fdb2099248a8baba1125ab Change-Id: Ib60b99425dc79ca4c5b23772f32036f4e17ad11f
2020-09-09Merge "bench: Add inodeop_bench benchmark" am: e804806d79temp_sam_168057903Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1421048 Change-Id: I477d2dfba05718c829fdb2099248a8baba1125ab
2020-09-09Merge "bench: Add inodeop_bench benchmark"Treehugger Robot
2020-09-08bench: Add inodeop_bench benchmarkStefano Duo
Add new benchmark capable of generating specific inode operations workloads. Currently, it supports create, delete, move, hardlink and symlink. Test: Manual run on cuttlefish and physical device Bug: 165903680 Signed-off-by: Stefano Duo <stefanoduo@google.com> Change-Id: Ia47f259b7ccea5fe1665b272c3cbc9ec1bf2eb56
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li
Bug: 166295507 Merged-In: Id417587a550b0f4abf5a6a3e4b4535011b21f627 Change-Id: Ibb5e8cf5f36dad408cf047dd0498aba24249b695
2020-08-11Merge "Add maco@ to vold OWNERS." am: 157a08bb92Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1396467 Change-Id: I0d0a8048465e190105f03dfe76fbf5c8393a4198
2020-08-11Merge "Add maco@ to vold OWNERS."Treehugger Robot
2020-08-11Add maco@ to vold OWNERS.Martijn Coenen
Bug: N/A Test: N/A Change-Id: Ib00991eccbd33e719a64d55da932f7f2bfab7b71
2020-08-10Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1395128 Change-Id: Iacb41f3dba6c2a57943f766b749d87efe6f4e4b3
2020-08-10Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level"Eric Biggers
2020-08-10vold: use __ANDROID_API_Q__ instead of pre_gki_levelEric Biggers
The name "pre_gki_level" is causing some confusion because not all devices launching with Android R are subject to the GKI requirement. (See b/161563110#comment11.) E.g., devices that use a 4.14-based kernel are exempt from GKI. However, the encryption requirements still apply. Just use __ANDROID_API_Q__ directly instead. No change in behavior. Change-Id: Id02ae1140845ac1ae7cf78be4e57fe34da028abf
2020-08-10Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: ↵Eric Biggers
213dbe30a1 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029 Change-Id: I29e6eab9571d4556883594049f4abc33d9ffa674
2020-08-10Merge "EncryptInPlace: ensure that backup superblocks get encrypted"Eric Biggers
2020-08-06EncryptInPlace: ensure that backup superblocks get encryptedWill Shiu
Block groups with EXT4_BG_BLOCK_UNINIT still have backup superblocks (and backup block group descriptors). Fix EncryptInPlace to encrypt these backup superblocks rather than leave them unencrypted. Previously leaving the backup superblocks unencrypted didn't cause any problems, but due to system/core commit 72abd7b246f7 ("Try to recover corrupted ext4 /data with backup superblock") it is causing problems. Bug: 162479411 Bug: 161871210 Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e
2020-07-17Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591 ↵Treehugger Robot
am: dd8b695c61 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586 Change-Id: I876aaf6bba933c964a3573d8053cc60829b3a5fa
2020-07-17Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586 Change-Id: Id417587a550b0f4abf5a6a3e4b4535011b21f627
2020-07-17Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586 Change-Id: Ibb6947f1fad7a31cf2a42c3604c76fcf45a7082a
2020-07-17Merge "vold: restore -D__ANDROID_DEBUGGABLE__"Treehugger Robot
2020-07-17vold: restore -D__ANDROID_DEBUGGABLE__Mark Salyzyn
Regression introduced by commit 7ebcc2bcfde2cf6713e2975224034b06ba0943d8 ("Revert "[Vold] Conditional dependency to ARC++ ObbVolume"") errantly removed the product_variables support for -D__ANDROID_DEBUGGABLE__ when built for userdebug builds. Restore stanza. Signed-off-by: Mark Salyzyn <salyzyn@google.com> Bug: 161454607 Test: adb-remount-test no longer reports a problem Change-Id: Ia7e55d1174fa7fac2d934d4aac06d15e8be388af
2020-07-17Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: ↵Eric Biggers
256b23b1c5 am: 350b5ae900 am: d0b2751e8f Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220 Change-Id: Id61233aba34e8c67a2ab3860c4259eaeaefdab15
2020-07-17Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: ↵Eric Biggers
83a3eecc03 am: 6b36554b38 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221 Change-Id: I18cbddc92985f88d95dca71b05b9d07919134af9
2020-07-17Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: ↵Eric Biggers
256b23b1c5 am: 350b5ae900 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220 Change-Id: Ia7fca6e61c58317002271c8338bb01a12e8223a5
2020-07-17Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221 Change-Id: Iffa50e4c549469de6425134369e609856f1d7813
2020-07-17Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: ↵Eric Biggers
256b23b1c5 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365220 Change-Id: I94b778955b2ee5cd8c462050e94c39ce05c96179
2020-07-17Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365221 Change-Id: If47e4ced3b37e44772d802fb8ebe2d9ad51c03e2
2020-07-17Merge "KeyUtil: use static local variable in isFsKeyringSupported()"Eric Biggers
2020-07-17Merge "vold: drop local fscrypt UAPI definitions"Eric Biggers
2020-07-16vold: drop local fscrypt UAPI definitionsEric Biggers
Now that Bionic's copy of <linux/fscrypt.h> has been updated, there's no need for vold to carry its own fscrypt_uapi.h. Test: build Change-Id: I61581ac74f7cf77bc8a835e64d96553a9d0c517a
2020-07-16KeyUtil: use static local variable in isFsKeyringSupported()Eric Biggers
Use C++'s built-in mechanism for one-time initialization rather than implement it ourselves in a way that isn't thread-safe. (It doesn't *actually* need to be thread-safe, since all callers of this run under ACQUIRE_CRYPT_LOCK. But that's not easy to verify.) Test: booted Cuttlefish and checked log for the one-time message "Detected support for FS_IOC_ADD_ENCRYPTION_KEY" Change-Id: I6ca5b143ca305fa95144e388efc9657e3507bf05
2020-07-16Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0 am: ↵Eric Biggers
4cd238b900 Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339 Change-Id: I862a51b219b0151c24d009921fa6cd509afa18b0
2020-07-16Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0Eric Biggers
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1363339 Change-Id: I23b9a01632b61a92896ae83e2152fa047dd85c48
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 16:24:56 +0000