commit fe2abbdbb592b9f6a01ca12d0feca461d006a420
author Carmen Jackson <carmenjackson@google.com> Mon May 21 16:16:05 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 21 16:16:05 2018 -0700
tree 3cafd609f84e4171bfa7c34e630f152223c42674
parent d4239ca74d6b33dff9371375d11400a3a2aafb34
parent 395b0a586f97da30e10429d345b4a2c1fc66ffb7

Merge "Add permissions for sync and fence tracepoints on user builds."
am: 395b0a586f

Change-Id: I9c1ead9adff3caa803acbcc8090cb855bf4bc883

cmds/atrace/atrace.rc

diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index f6c8e7f..1c88ff9 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -81,6 +81,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