Merge Android 24Q1 Release (ab/11220357)temp_319669529

Bug: 319669529
Merged-In: I5feff99d17e7933ff1a463900d43c14754f6cd26
Change-Id: I13a923e9948486b305be69058912a0c653bfe192

6 files changed, 9 insertions, 51 deletions

diff --git a/OWNERS b/OWNERS
index 791abb4..5232bc3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
-include platform/system/sepolicy:/OWNERS
+include device/google/gs-common:/sepolicy/OWNERS
+
+adamshih@google.com
 
-rurumihong@google.com
diff --git a/husky/genfs_contexts b/husky/genfs_contexts
index be36a68..632676b 100644
--- a/husky/genfs_contexts
+++ b/husky/genfs_contexts
@@ -1,18 +1,7 @@
 # Haptics
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-6/6-0043            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-5/5-0043            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-4/4-0043            u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-0/0-0043            u:object_r:sysfs_vibrator:s0
 
 # WLC
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-0/0-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-1/1-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-2/2-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-3/3-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-4/4-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-5/5-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-6/6-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-7/7-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-8/8-003c                            u:object_r:sysfs_wlc:s0
 genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-003c                            u:object_r:sysfs_wlc:s0
 
 # GPS
diff --git a/husky/radio.te b/husky/radio.te
new file mode 100644
index 0000000..a2c40a1
--- /dev/null
+++ b/husky/radio.te
@@ -0,0 +1 @@
+allow radio scheduling_policy_service:service_manager find;
diff --git a/ripcurrent/genfs_contexts b/ripcurrent/genfs_contexts
index 5bae1c3..ffff32a 100644
--- a/ripcurrent/genfs_contexts
+++ b/ripcurrent/genfs_contexts
@@ -1,32 +1,9 @@
 # Haptics
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-6/6-0042            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-5/5-0042            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-4/4-0042            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-6/6-0043            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-5/5-0043            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-4/4-0043            u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-0/0-0042            u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-0/0-0043            u:object_r:sysfs_vibrator:s0
 
 # WLC
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-0/0-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-1/1-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-2/2-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-3/3-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-4/4-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-5/5-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-6/6-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-7/7-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-8/8-003c                            u:object_r:sysfs_wlc:s0
 genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-003c                            u:object_r:sysfs_wlc:s0
-
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-0/0-003b                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-1/1-003b                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-2/2-003b                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-3/3-003b                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-4/4-003b                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-5/5-003b                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-6/6-003b                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-7/7-003b                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-8/8-003b                            u:object_r:sysfs_wlc:s0
 genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-003b                            u:object_r:sysfs_wlc:s0
 
 # GPS
diff --git a/shiba/genfs_contexts b/shiba/genfs_contexts
index be36a68..632676b 100644
--- a/shiba/genfs_contexts
+++ b/shiba/genfs_contexts
@@ -1,18 +1,7 @@
 # Haptics
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-6/6-0043            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-5/5-0043            u:object_r:sysfs_vibrator:s0
-genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-4/4-0043            u:object_r:sysfs_vibrator:s0
+genfscon sysfs /devices/platform/10c80000.hsi2c/i2c-0/0-0043            u:object_r:sysfs_vibrator:s0
 
 # WLC
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-0/0-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-1/1-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-2/2-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-3/3-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-4/4-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-5/5-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-6/6-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-7/7-003c                            u:object_r:sysfs_wlc:s0
-genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-8/8-003c                            u:object_r:sysfs_wlc:s0
 genfscon sysfs /devices/platform/10c90000.hsi2c/i2c-9/9-003c                            u:object_r:sysfs_wlc:s0
 
 # GPS
diff --git a/shiba/radio.te b/shiba/radio.te
new file mode 100644
index 0000000..a2c40a1
--- /dev/null
+++ b/shiba/radio.te
@@ -0,0 +1 @@
+allow radio scheduling_policy_service:service_manager find;