commit 48f76ea80cb3aa5cc0a80538ee8bbd640ad979e3
author Carmen Jackson <carmenjackson@google.com> Mon May 21 14:16:34 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 21 14:16:34 2018 -0700
tree 722aeadd69186a50a988cd4c4fc2820029d0898b
parent 2de60f022e5b7e75deed9f069309eeabe30c49fe
parent 454a4956570bbcdf195bf75c4f68b29fa4e1eed6

Merge "Add permissions for sync and fence tracepoints on user builds." into pi-dev am: 01966a45b6
am: 454a495657

Change-Id: Ib475ac003d88f8d86f0e35d52568208618eea00e

cmds/atrace/atrace.rc

diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index c6cc8cb..d10c539 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -83,6 +83,11 @@
     chmod 0666 /sys/kernel/tracing/events/i2c/smbus_reply/enable
     chmod 0666 /sys/kernel/debug/tracing/events/lowmemorykiller/enable
     chmod 0666 /sys/kernel/tracing/events/lowmemorykiller/enable
+    chmod 0666 /sys/kernel/debug/tracing/events/sync/enable
+    chmod 0666 /sys/kernel/tracing/events/sync/enable
+    chmod 0666 /sys/kernel/debug/tracing/events/fence/enable
+    chmod 0666 /sys/kernel/tracing/events/fence/enable
+
 
     # disk
     chmod 0666 /sys/kernel/tracing/events/f2fs/f2fs_get_data_block/enable

cmds/atrace/atrace_userdebug.rc

diff --git a/cmds/atrace/atrace_userdebug.rc b/cmds/atrace/atrace_userdebug.rc
index 93a29ba..f4e5b98 100644
--- a/cmds/atrace/atrace_userdebug.rc
+++ b/cmds/atrace/atrace_userdebug.rc
@@ -5,8 +5,6 @@
 # Access control to these files is now entirely in selinux policy.
 
 on post-fs
-    chmod 0666 /sys/kernel/tracing/events/sync/enable
-    chmod 0666 /sys/kernel/debug/tracing/events/sync/enable
     chmod 0666 /sys/kernel/tracing/events/workqueue/enable
     chmod 0666 /sys/kernel/debug/tracing/events/workqueue/enable
     chmod 0666 /sys/kernel/tracing/events/regulator/enable