commit cc01eb9d89974ed1aa1a4029f7df0b5ba5f8ae20
author Wei Wang <wvw@google.com> Thu Mar 18 23:49:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 18 23:49:14 2021 +0000
tree bc2da379d9f3de37141177343b9f81c001ad516b
parent 1d1f2c257db52d6dc55cc5563dab543ee5cd41d7
parent 0c032814b9e602625f762a2beb91da102c5350ff

Merge "Grant access to cpuhp_pause trace point"

apex/com.android.sdkext-file_contexts

diff --git a/apex/com.android.sdkext-file_contexts b/apex/com.android.sdkext-file_contexts
index 551a12c..2d59dda 100644
--- a/apex/com.android.sdkext-file_contexts
+++ b/apex/com.android.sdkext-file_contexts
@@ -1,3 +1,2 @@
-(/.*)?                       u:object_r:system_file:s0
-/bin/derive_classpath        u:object_r:derive_classpath_exec:s0
-/bin/derive_sdk              u:object_r:derive_sdk_exec:s0
+(/.*)?                u:object_r:system_file:s0
+/bin/derive_sdk       u:object_r:derive_sdk_exec:s0

private/derive_classpath.te

diff --git a/private/derive_classpath.te b/private/derive_classpath.te
deleted file mode 100644
index 15f1973..0000000
--- a/private/derive_classpath.te
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Domain for derive_classpath
-type derive_classpath, domain, coredomain;
-type derive_classpath_exec, system_file_type, exec_type, file_type;
-init_daemon_domain(derive_classpath)
-
-# Create /data/system/environ/classpath file
-allow derive_classpath environ_system_data_file:dir rw_dir_perms;
-allow derive_classpath environ_system_data_file:file create_file_perms;

private/file.te

diff --git a/private/file.te b/private/file.te
index 984a7b6..910210d 100644
--- a/private/file.te
+++ b/private/file.te
@@ -53,6 +53,3 @@
 
 # /data/misc/odsign
 type odsign_data_file, file_type, data_file_type, core_data_file_type;
-
-# /data/system/environ
-type environ_system_data_file, file_type, data_file_type, core_data_file_type;

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 1347797..f8bb5ec 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -504,7 +504,6 @@
 #
 /data		u:object_r:system_data_root_file:s0
 /data/(.*)?		u:object_r:system_data_file:s0
-/data/system/environ(/.*)? u:object_r:environ_system_data_file:s0
 /data/system/packages\.list u:object_r:packages_list_file:s0
 /data/unencrypted(/.*)?         u:object_r:unencrypted_data_file:s0
 /data/backup(/.*)?		u:object_r:backup_data_file:s0

public/dumpstate.te

diff --git a/public/dumpstate.te b/public/dumpstate.te
index 45540b3..28bdb82 100644
--- a/public/dumpstate.te
+++ b/public/dumpstate.te
@@ -370,6 +370,7 @@
 #Allow access to /dev/binderfs/binder_logs
 allow dumpstate binderfs_logs:dir r_dir_perms;
 allow dumpstate binderfs_logs:file r_file_perms;
+allow dumpstate binderfs_logs_proc:file r_file_perms;
 
 allow dumpstate apex_info_file:file getattr;