From e4ee1e6655b47573fbcfb032c277a7d251a1c7c9 Mon Sep 17 00:00:00 2001
From: Tri Vo <trong@google.com>
Date: Fri, 12 Oct 2018 18:05:37 -0700
Subject: [PATCH] Remove vendor sepolicy for input files.

Bug: 112880217
Test: aosp_walleye boots without denials to input files
Change-Id: Ida8c3ef10b21d40937de710000a394a9d435bf13
---
 sepolicy/vendor/file.te          | 4 ----
 sepolicy/vendor/file_contexts    | 4 ----
 sepolicy/vendor/system_server.te | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te
index a43fb2b8..c9a1d099 100644
--- a/sepolicy/vendor/file.te
+++ b/sepolicy/vendor/file.te
@@ -84,10 +84,6 @@ type sysfs_diag, fs_type, sysfs_type;
 
 type hexagon_halide_file, vendor_file_type, file_type;
 
-# input files
-type idc_file, file_type, vendor_file_type;
-type keylayout_file, file_type, vendor_file_type;
-
 # Battery Stats file
 typeattribute sysfs_batteryinfo mlstrustedobject;
 
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index dd3c332f..be07ab29 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -254,10 +254,6 @@
 /data/vendor/audio(/.*)?               u:object_r:audio_vendor_data_file:s0
 /data/vendor/mediadrm(/.*)?            u:object_r:mediadrm_vendor_data_file:s0
 
-# input files
-/vendor/usr/idc(/.*)?                  u:object_r:idc_file:s0
-/vendor/usr/keylayout(/.*)?            u:object_r:keylayout_file:s0
-
 # /
 /tombstones             u:object_r:rootfs:s0
 /dsp                    u:object_r:rootfs:s0
diff --git a/sepolicy/vendor/system_server.te b/sepolicy/vendor/system_server.te
index bcba87c3..d7b84619 100644
--- a/sepolicy/vendor/system_server.te
+++ b/sepolicy/vendor/system_server.te
@@ -12,10 +12,6 @@ allow system_server wlan_device:chr_file rw_file_perms;
 # once cpufreq functionality is hidden behind a HAL.
 allow system_server sysfs_devices_system_cpu:file w_file_perms;
 
-# input files
-r_dir_file(system_server, idc_file)
-r_dir_file(system_server, keylayout_file)
-
 # TODO(b/30675296): Remove following dontaudit's upon resolution of this bug
 # The timerslack_ns denials spam the system really horribly
 dontaudit system_server audioserver:file write;