summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Carmen Jackson <carmenjackson@google.com> 2018-05-21 16:16:05 -0700
committer android-build-merger <android-build-merger@google.com> 2018-05-21 16:16:05 -0700
commitfe2abbdbb592b9f6a01ca12d0feca461d006a420 (patch)
tree3cafd609f84e4171bfa7c34e630f152223c42674
parentd4239ca74d6b33dff9371375d11400a3a2aafb34 (diff)
parent395b0a586f97da30e10429d345b4a2c1fc66ffb7 (diff)
Merge "Add permissions for sync and fence tracepoints on user builds."
am: 395b0a586f Change-Id: I9c1ead9adff3caa803acbcc8090cb855bf4bc883
-rw-r--r--cmds/atrace/atrace.rc5
-rw-r--r--cmds/atrace/atrace_userdebug.rc2
2 files changed, 5 insertions, 2 deletions
diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index f6c8e7f5cb..1c88ff982f 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -81,6 +81,11 @@ on post-fs
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
diff --git a/cmds/atrace/atrace_userdebug.rc b/cmds/atrace/atrace_userdebug.rc
index 93a29bab73..f4e5b9814c 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