Merge Android U (ab/10368041)

Bug: 291102124 Merged-In: I3991b61b871474a0c9ed6fdd1a10fa9b4f887e55 Change-Id: Ic181d86bda25f23126fd0bb53dabbd42ace0bae5
2023-08-14 15:34:36 -07:00
parent 1415065497 12b2e12970
commit fa09141c1c
8 changed files with 38 additions and 6 deletions
--- a/cheetah-sepolicy.mk
+++ b/cheetah-sepolicy.mk
@@ -1,3 +1,3 @@
 # sepolicy that are shared among devices using whitechapel
 BOARD_SEPOLICY_DIRS += device/google/pantah-sepolicy/cheetah
-BOARD_SEPOLICY_DIRS += device/google/pantah-sepolicy/tracking_denials
+
--- a/cheetah/genfs_contexts
+++ b/cheetah/genfs_contexts
@@ -1,2 +1,14 @@
 # Haptics
 genfscon sysfs /devices/platform/10970000.hsi2c/i2c-4/i2c-cs40l26a             u:object_r:sysfs_vibrator:s0
+
+# WLC
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-p9412                 u:object_r:sysfs_wlc:s0
--- a/cloudripper-sepolicy.mk
+++ b/cloudripper-sepolicy.mk
@@ -1,3 +1,3 @@
 # sepolicy that are shared among devices using whitechapel
 BOARD_SEPOLICY_DIRS += device/google/pantah-sepolicy/cloudripper
-BOARD_SEPOLICY_DIRS += device/google/pantah-sepolicy/tracking_denials
+
--- a/cloudripper/genfs_contexts
+++ b/cloudripper/genfs_contexts
@@ -1,3 +1,15 @@
 # Haptics
 genfscon sysfs /devices/platform/10970000.hsi2c/i2c-4/i2c-cs40l26a             u:object_r:sysfs_vibrator:s0
 genfscon sysfs /devices/platform/10970000.hsi2c/i2c-4/i2c-cs40l26a-dual        u:object_r:sysfs_vibrator:s0
+
+# WLC
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-p9412                 u:object_r:sysfs_wlc:s0
--- a/panther-sepolicy.mk
+++ b/panther-sepolicy.mk
@@ -1,3 +1,2 @@
 # sepolicy that are shared among devices using whitechapel
 BOARD_SEPOLICY_DIRS += device/google/pantah-sepolicy/panther
-BOARD_SEPOLICY_DIRS += device/google/pantah-sepolicy/tracking_denials
--- a/panther/genfs_contexts
+++ b/panther/genfs_contexts
@@ -1,2 +1,14 @@
 # Haptics
 genfscon sysfs /devices/platform/10970000.hsi2c/i2c-4/i2c-cs40l26a             u:object_r:sysfs_vibrator:s0
+
+# WLC
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-0/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-1/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-2/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-3/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-4/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-5/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-6/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-p9412                 u:object_r:sysfs_wlc:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/i2c-p9412                 u:object_r:sysfs_wlc:s0
--- a/ravenclaw-sepolicy.mk
+++ b/ravenclaw-sepolicy.mk
@@ -1,3 +1,2 @@
 # sepolicy that are shared among devices using whitechapel
 BOARD_SEPOLICY_DIRS += device/google/pantah-sepolicy/ravenclaw
-BOARD_SEPOLICY_DIRS += device/google/pantah-sepolicy/tracking_denials
--- a/tracking_denials/hal_dumpstate_default.te
+++ b/tracking_denials/hal_dumpstate_default.te
@@ -1,2 +0,0 @@
-# b/263548298
-dontaudit hal_dumpstate_default sysfs:dir { read };