commit 3b432309efce09297e3a19601bfbc1447d0fe5ac
author Nikita Ioffe <ioffe@google.com> Fri Jan 06 17:50:51 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 06 17:50:51 2023 +0000
tree 03f3427987adb0bdd57bb6fb5ad1fdb2a69cfea0
parent 7f7850a6489a5dd322d4766ccc25756933e86cef
parent 4a5304d225cfc4e72a9df5584da884cf77752e2b

Merge "Revert "vold: explicitly specify capabilities"" am: d0c81a283b am: 4a5304d225

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

Change-Id: I5105da1b8da411d3a4b968d69a547de9e70e66ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vold.rc

diff --git a/vold.rc b/vold.rc
index 466e2db..9474a1e 100644
--- a/vold.rc
+++ b/vold.rc
@@ -7,5 +7,3 @@
     shutdown critical
     group root reserved_disk
     reboot_on_failure reboot,vold-failed
-    # CAP_SETGID, CAP_SETUID, CAP_SYS_RESOURCE are not used by the vold itself, but instead are used by the /system/bin/sdcard that vold execs
-    capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL MKNOD NET_ADMIN SYS_ADMIN SYS_CHROOT SYS_NICE SYS_PTRACE BLOCK_SUSPEND SETGID SETUID SYS_RESOURCE