From 9aa32ce3c9b067fe65678c189d89ee7fe69b8a2f Mon Sep 17 00:00:00 2001
From: "Kevin F. Haggerty" <haggertk@lineageos.org>
Date: Mon, 21 Jan 2019 14:27:20 -0700
Subject: [PATCH] msm8974-common: sepolicy: Adapt to global sepolicy merges

* Several items merged globally caused duplicate definition of paths
  that were previously labeled here.

This reverts commit 27afbf1dc60d9956d02bc647cbd7c783d2cbd740.
This reverts commit 7fb5a8c6cb5eb333c3683c9a4359aeb4fccc0bff.
This partially reverts commit bb196ad94b8f814d813a92cb20819051efaf9850.
This partially reverts commit c39a735ab5212823b1d45a66a11d7873a0bc66ac.

Change-Id: I901e5aa78058e1a465f110cde31fb7d76eaf3d51
---
 sepolicy/common/file.te       | 1 -
 sepolicy/common/file_contexts | 4 ----
 sepolicy/common/init.te       | 1 -
 3 files changed, 6 deletions(-)

diff --git a/sepolicy/common/file.te b/sepolicy/common/file.te
index ad733f4..2ef5578 100644
--- a/sepolicy/common/file.te
+++ b/sepolicy/common/file.te
@@ -16,7 +16,6 @@ type sysfs_sec_thermistor, fs_type, sysfs_type;
 type sysfs_sec_touchkey, fs_type, sysfs_type;
 type sysfs_sec_tsp, fs_type, sysfs_type;
 type sysfs_usb_otg, fs_type, sysfs_type;
-type sysfs_usb_storage_gadget, fs_type, sysfs_type;
 type sysfs_wifi_writeable, fs_type, sysfs_type;
 
 type bt_fw_file, file_type;
diff --git a/sepolicy/common/file_contexts b/sepolicy/common/file_contexts
index 90b896b..ba243e2 100644
--- a/sepolicy/common/file_contexts
+++ b/sepolicy/common/file_contexts
@@ -46,12 +46,10 @@
 
 # sysfs - block/storage
 /sys/devices/msm_sdcc\.[0-9]/mmc_host/mmc[0-9]/mmc[0-9]:[0-9]+/block/mmcblk[0-9]/bkops_en    u:object_r:sysfs_io_sched_tuneable:s0
-/sys/devices/msm_sdcc\.[0-9]/mmc_host/mmc[0-9]/mmc[0-9]:[0-9]+/block/mmcblk[0-9]/stat        u:object_r:sysfs_disk_stat:s0
 /sys/devices/msm_sdcc\.[0-9]/mmc_host/mmc[0-9]/power(/.*)?                                   u:object_r:sysfs_mmc_host:s0
 
 # sysfs - cpu/perf
 /sys/devices/system/soc/soc0(/.*)?                      u:object_r:sysfs_socinfo:s0
-/sys/module/msm_pm/modes/cpu[0-9](/.*)?                 u:object_r:sysfs_msm_perf:s0
 
 # sysfs - graphics/panel
 /sys/class/mhl(/.*)?                                    u:object_r:sysfs_graphics:s0
@@ -66,7 +64,6 @@
 # sysfs - leds
 /sys/devices/i2c\.[0-9]+/i2c-[0-9]+/[0-9]+-[a-z0-9]+/leds(/.*)?  u:object_r:sysfs_leds:s0
 /sys/devices/i2c\.[0-9]+/i2c-[0-9]+/[0-9]+-[a-z0-9]+/max[a-z0-9]+-led/leds(/.*)? u:object_r:sysfs_leds:s0
-/sys/devices/leds-qpnp-[0-9]+/leds(/.*)?                         u:object_r:sysfs_leds:s0
 
 # sysfs - mdnie
 /sys/devices/virtual/mdnie/mdnie(/.*)?                  u:object_r:sysfs_mdnie:s0
@@ -91,5 +88,4 @@
 /sys/devices/virtual/sensors(/.*)?                      u:object_r:sysfs_sensors:s0
 
 # sysfs - usb
-/sys/devices/msm_dwc3/[a-f0-9]+\.dwc3/gadget/lun[0-9]+(/.*)? u:object_r:sysfs_usb_storage_gadget:s0
 /sys/devices/virtual/host_notify/usb_otg(/.*)?               u:object_r:sysfs_usb_otg:s0
diff --git a/sepolicy/common/init.te b/sepolicy/common/init.te
index 22737fe..061cf7a 100644
--- a/sepolicy/common/init.te
+++ b/sepolicy/common/init.te
@@ -36,7 +36,6 @@ allow init {
     sysfs_sensors
     sysfs_socinfo
     sysfs_usb_otg
-    sysfs_usb_storage_gadget
     sysfs_wifi_writeable
 }:file setattr;