summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-09-01 11:58:29 -0500
committerandroid-build-team Robot2017-09-01 17:09:10 -0500
commit2ebe9e6f91159c839458c0f016e0d55851a0461e (patch)
treeb16f9cc34bcc2af5ba56238cedd56caf88026513
parent5e31c140219ff8d59f5fd96f89256b744825e284 (diff)
downloadsystem-sepolicy-2ebe9e6f91159c839458c0f016e0d55851a0461e.tar.gz
system-sepolicy-2ebe9e6f91159c839458c0f016e0d55851a0461e.tar.xz
system-sepolicy-2ebe9e6f91159c839458c0f016e0d55851a0461e.zip
Revert "Add permissions for screencap for dumpstate."
This reverts commit b5dd44b1ba22e47360714513bc78de6c5c23ec64. Bug: 65206688 Change-Id: I00431ae7834a562e34e8959446d84a0077834091 (cherry picked from commit 9c571765d105a2781a375c9560883183d4853325)
-rw-r--r--private/screencap.te3
-rw-r--r--public/domain.te3
-rw-r--r--public/screencap.te1
3 files changed, 1 insertions, 6 deletions
diff --git a/private/screencap.te b/private/screencap.te
index d6bf489a..764880f5 100644
--- a/private/screencap.te
+++ b/private/screencap.te
@@ -1,3 +1,4 @@
1type screencap, domain;
1type screencap_exec, exec_type, file_type; 2type screencap_exec, exec_type, file_type;
2 3
3typeattribute screencap coredomain; 4typeattribute screencap coredomain;
@@ -34,8 +35,6 @@ allow screencap mnt_user_file:dir search;
34allow screencap mnt_user_file:lnk_file read; 35allow screencap mnt_user_file:lnk_file read;
35allow screencap sdcardfs:dir { search write }; 36allow screencap sdcardfs:dir { search write };
36allow screencap sdcardfs:file { open write }; 37allow screencap sdcardfs:file { open write };
37allow screencap shell_data_file:file create_file_perms;
38allow screencap shell_data_file:dir rw_dir_perms;
39allow screencap storage_file:dir search; 38allow screencap storage_file:dir search;
40allow screencap storage_file:lnk_file read; 39allow screencap storage_file:lnk_file read;
41allow screencap tmpfs:dir search; 40allow screencap tmpfs:dir search;
diff --git a/public/domain.te b/public/domain.te
index aca976c6..f5c72cc4 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -924,7 +924,6 @@ neverallow {
924 -dumpstate 924 -dumpstate
925 -installd 925 -installd
926 -init 926 -init
927 -screencap
928 -shell 927 -shell
929 -vold 928 -vold
930} shell_data_file:dir no_w_dir_perms; 929} shell_data_file:dir no_w_dir_perms;
@@ -936,7 +935,6 @@ neverallow {
936 -dumpstate 935 -dumpstate
937 -init 936 -init
938 -installd 937 -installd
939 -screencap
940 -system_server # why? 938 -system_server # why?
941 userdebug_or_eng(`-uncrypt') 939 userdebug_or_eng(`-uncrypt')
942} shell_data_file:dir { open search }; 940} shell_data_file:dir { open search };
@@ -949,7 +947,6 @@ neverallow {
949 -appdomain 947 -appdomain
950 -dumpstate 948 -dumpstate
951 -installd 949 -installd
952 -screencap
953 userdebug_or_eng(`-uncrypt') 950 userdebug_or_eng(`-uncrypt')
954} shell_data_file:file open; 951} shell_data_file:file open;
955 952
diff --git a/public/screencap.te b/public/screencap.te
deleted file mode 100644
index ad8639f0..00000000
--- a/public/screencap.te
+++ /dev/null
@@ -1 +0,0 @@
1type screencap, domain;