Merge Android 14

Bug: 298295554
Merged-In: I46c15b9e472dc67fa9f60f489e35dee810e7a0bf
Change-Id: I6abb81a7fbd3d0cadf59d0de811391487df23a85

8 files changed, 38 insertions, 6 deletions

diff --git a/cheetah-sepolicy.mk b/cheetah-sepolicy.mk
index 3c342fa..650b3af 100644
--- 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
+
diff --git a/cheetah/genfs_contexts b/cheetah/genfs_contexts
index caf2581..e6617c8 100644
--- 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
diff --git a/cloudripper-sepolicy.mk b/cloudripper-sepolicy.mk
index ae2ac7f..98a403c 100644
--- 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
+
diff --git a/cloudripper/genfs_contexts b/cloudripper/genfs_contexts
index 11e438e..969c4ca 100644
--- 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
diff --git a/panther-sepolicy.mk b/panther-sepolicy.mk
index 4168459..bdfe7db 100644
--- 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
diff --git a/panther/genfs_contexts b/panther/genfs_contexts
index caf2581..e6617c8 100644
--- 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
diff --git a/ravenclaw-sepolicy.mk b/ravenclaw-sepolicy.mk
index acc1bd3..d41bbae 100644
--- 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
diff --git a/tracking_denials/hal_dumpstate_default.te b/tracking_denials/hal_dumpstate_default.te
deleted file mode 100644
index 2a33551..0000000
--- a/tracking_denials/hal_dumpstate_default.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/263548298
-dontaudit hal_dumpstate_default sysfs:dir { read };