commit bdabddfe122ee77067469cfc5fd8f6ea168b4b21
author Jeff Sharkey <jsharkey@google.com> Wed Feb 06 20:08:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 06 20:08:39 2019 +0000
tree 5e165d32efe032aaae0554ca40d15d15b178c0e3
parent 9125a0aefdae660a655a161d8c4e87d257bc0fd6
parent d101896ec8e16c963aaeea8cf98610a16ba328b1

Merge "Allow system watchdog to collect traces from vold."

private/crash_dump.te

diff --git a/private/crash_dump.te b/private/crash_dump.te
index fe25bad..bb13bff 100644
--- a/private/crash_dump.te
+++ b/private/crash_dump.te
@@ -15,7 +15,7 @@
   -vold
 }:process { ptrace signal sigchld sigstop sigkill };
 userdebug_or_eng(`
-  allow crash_dump { llkd logd }:process { ptrace signal sigchld sigstop sigkill };
+  allow crash_dump { llkd logd vold }:process { ptrace signal sigchld sigstop sigkill };
 ')
 
 ###
@@ -37,6 +37,7 @@
   ueventd
   vendor_init
   vold
+  userdebug_or_eng(`-vold')
 }:process { signal sigstop sigkill };
 
 neverallow crash_dump self:process ptrace;

private/system_server.te

diff --git a/private/system_server.te b/private/system_server.te
index 2cf5ea7..27407f0 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -276,6 +276,7 @@
   sdcardd
   statsd
   surfaceflinger
+  vold
 
   # This list comes from HAL_INTERFACES_OF_INTEREST in
   # frameworks/base/services/core/java/com/android/server/Watchdog.java.