Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 582d9188 authored by Gavin Corkery's avatar Gavin Corkery Committed by Automerger Merge Worker
Browse files

Merge "Revert "dumpstate: explicitly specify capabilities"" am: 74277baf am:... 

Merge "Revert "dumpstate: explicitly specify capabilities"" am: 74277baf am: 4023b99f am: eb0a009c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2422938



Change-Id: I12b721823c30ede67899489daee721ff67ffb0eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 994ee279 eb0a009c

cmds/dumpstate/dumpstate.rc

+0 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ service dumpstate /system/bin/dumpstate -s 
    socket dumpstate stream 0660 shell log

    disabled

    oneshot

    capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL NET_ADMIN NET_RAW SETGID SETUID SYS_PTRACE SYS_RESOURCE BLOCK_SUSPEND SYSLOG



# dumpstatez generates a zipped bugreport but also uses a socket to print the file location once

# it is finished.
@@ -17,11 +16,9 @@ service dumpstatez /system/bin/dumpstate -S 
    class main

    disabled

    oneshot

    capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL NET_ADMIN NET_RAW SETGID SETUID SYS_PTRACE SYS_RESOURCE BLOCK_SUSPEND SYSLOG



# bugreportd starts dumpstate binder service and makes it wait for a listener to connect.

service bugreportd /system/bin/dumpstate -w

    class main

    disabled

    oneshot
 
    capabilities CHOWN DAC_OVERRIDE DAC_READ_SEARCH FOWNER FSETID KILL NET_ADMIN NET_RAW SETGID SETUID SYS_PTRACE SYS_RESOURCE BLOCK_SUSPEND SYSLOG