resolve merge conflicts of 27c0aa7a to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Ia28707ec565a0792bc882fbffe9e8ab9968535f5
Change-Id: I1f087fe5e7a71761a16673331619f52998473b44
diff --git a/private/shell.te b/private/shell.te
index 90bed27..0886820 100644
--- a/private/shell.te
+++ b/private/shell.te
@@ -5,8 +5,8 @@
# systrace support - allow atrace to run
allow shell debugfs_tracing:dir r_dir_perms;
-allow shell debugfs_tracing:file r_file_perms;
-allow shell tracing_shell_writable:file rw_file_perms;
+allow shell debugfs_tracing:file rw_file_perms;
+
allow shell debugfs_trace_marker:file getattr;
allow shell atrace_exec:file rx_file_perms;
@@ -14,7 +14,7 @@
allow shell config_gz:file r_file_perms;
userdebug_or_eng(`
- allow shell tracing_shell_writable_debug:file rw_file_perms;
+ allow shell debugfs_tracing_debug:file rw_file_perms;
')
# Run app_process.