From 9c571765d105a2781a375c9560883183d4853325 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 1 Sep 2017 16:58:29 +0000
Subject: [PATCH] Revert "Add permissions for screencap for dumpstate."

This reverts commit b5dd44b1ba22e47360714513bc78de6c5c23ec64.

Bug: 65206688

Change-Id: I00431ae7834a562e34e8959446d84a0077834091
---
 private/screencap.te | 3 +--
 public/domain.te     | 3 ---
 public/screencap.te  | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 public/screencap.te

diff --git a/private/screencap.te b/private/screencap.te
index d6bf489a9..764880f55 100644
--- a/private/screencap.te
+++ b/private/screencap.te
@@ -1,3 +1,4 @@
+type screencap, domain;
 type screencap_exec, exec_type, file_type;
 
 typeattribute screencap coredomain;
@@ -34,8 +35,6 @@ allow screencap mnt_user_file:dir search;
 allow screencap mnt_user_file:lnk_file read;
 allow screencap sdcardfs:dir { search write };
 allow screencap sdcardfs:file { open write };
-allow screencap shell_data_file:file create_file_perms;
-allow screencap shell_data_file:dir rw_dir_perms;
 allow screencap storage_file:dir search;
 allow screencap storage_file:lnk_file read;
 allow screencap tmpfs:dir search;
diff --git a/public/domain.te b/public/domain.te
index aca976c67..f5c72cc4d 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -924,7 +924,6 @@ neverallow {
   -dumpstate
   -installd
   -init
-  -screencap
   -shell
   -vold
 } shell_data_file:dir no_w_dir_perms;
@@ -936,7 +935,6 @@ neverallow {
   -dumpstate
   -init
   -installd
-  -screencap
   -system_server # why?
   userdebug_or_eng(`-uncrypt')
 } shell_data_file:dir { open search };
@@ -949,7 +947,6 @@ neverallow {
   -appdomain
   -dumpstate
   -installd
-  -screencap
   userdebug_or_eng(`-uncrypt')
 } shell_data_file:file open;
 
diff --git a/public/screencap.te b/public/screencap.te
deleted file mode 100644
index ad8639f0a..000000000
--- a/public/screencap.te
+++ /dev/null
@@ -1 +0,0 @@
-type screencap, domain;
-- 
GitLab