Merge "Allow shell to read profcollect data files"
diff --git a/apex/com.android.compos-file_contexts b/apex/com.android.compos-file_contexts
index f404a07..d678ca6 100644
--- a/apex/com.android.compos-file_contexts
+++ b/apex/com.android.compos-file_contexts
@@ -1,5 +1,4 @@
(/.*)? u:object_r:system_file:s0
-/bin/compos_key_cmd u:object_r:compos_key_cmd_exec:s0
/bin/compos_key_main u:object_r:compos_exec:s0
/bin/compsvc u:object_r:compos_exec:s0
/bin/compsvc_worker u:object_r:compos_exec:s0
diff --git a/microdroid/system/private/compos.te b/microdroid/system/private/compos.te
index a126a02..9e6b2bb 100644
--- a/microdroid/system/private/compos.te
+++ b/microdroid/system/private/compos.te
@@ -2,9 +2,6 @@
type compos, domain, coredomain, microdroid_payload;
type compos_exec, exec_type, file_type, system_file_type;
-type compos_key_cmd, domain, coredomain;
-type compos_key_cmd_exec, exec_type, file_type, system_file_type;
-
allow compos self:vsock_socket { create_socket_perms_no_ioctl listen accept };
# Talk to binder services (for keystore)
diff --git a/private/compos.te b/private/compos.te
index a86fd38..f4cdc17 100644
--- a/private/compos.te
+++ b/private/compos.te
@@ -1,6 +1,3 @@
# TODO(b/193504816): move this to compos APEX
type compos, domain, coredomain;
type compos_exec, exec_type, file_type, system_file_type;
-
-type compos_key_cmd, domain, coredomain;
-type compos_key_cmd_exec, exec_type, file_type, system_file_type;