Merge "Update avc error on ROM 7444346" into sc-dev
diff --git a/gs101-sepolicy.mk b/gs101-sepolicy.mk
index ffe102f..989bb70 100644
--- a/gs101-sepolicy.mk
+++ b/gs101-sepolicy.mk
@@ -37,3 +37,6 @@
# Wifi Logger
BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/wifi_logger
+
+# Public
+PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs101-sepolicy/public
diff --git a/private/mediaprovider_app.te b/private/mediaprovider_app.te
new file mode 100644
index 0000000..9d50844
--- /dev/null
+++ b/private/mediaprovider_app.te
@@ -0,0 +1,2 @@
+dontaudit mediaprovider_app sysfs_vendor_sched:dir search;
+
diff --git a/public/file.te b/public/file.te
new file mode 100644
index 0000000..4c15c47
--- /dev/null
+++ b/public/file.te
@@ -0,0 +1,7 @@
+# Vendor sched files
+type sysfs_vendor_sched, sysfs_type, fs_type;
+userdebug_or_eng(`
+ typeattribute sysfs_vendor_sched mlstrustedobject;
+')
+type proc_vendor_sched, proc_type, fs_type;
+
diff --git a/tracking_denials/bluetooth.te b/tracking_denials/bluetooth.te
deleted file mode 100644
index ff6d7f9..0000000
--- a/tracking_denials/bluetooth.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# b/190563916
-dontaudit bluetooth sysfs_vendor_sched:dir search;
diff --git a/trusty_metricsd/file_contexts b/trusty_metricsd/file_contexts
new file mode 100644
index 0000000..bedf743
--- /dev/null
+++ b/trusty_metricsd/file_contexts
@@ -0,0 +1 @@
+/vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0
diff --git a/whitechapel/vendor/google/trusty_metricsd.te b/trusty_metricsd/trusty_metricsd.te
similarity index 100%
rename from whitechapel/vendor/google/trusty_metricsd.te
rename to trusty_metricsd/trusty_metricsd.te
diff --git a/whitechapel/vendor/google/bluetooth.te b/whitechapel/vendor/google/bluetooth.te
new file mode 100644
index 0000000..b246eca
--- /dev/null
+++ b/whitechapel/vendor/google/bluetooth.te
@@ -0,0 +1,3 @@
+allow bluetooth sysfs_vendor_sched:dir search;
+allow bluetooth sysfs_vendor_sched:file w_file_perms;
+
diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te
index e0a05a5..55d1f16 100644
--- a/whitechapel/vendor/google/file.te
+++ b/whitechapel/vendor/google/file.te
@@ -134,13 +134,6 @@
type vendor_camera_data_file, file_type, data_file_type;
type sysfs_camera, sysfs_type, fs_type;
-# Vendor sched files
-type sysfs_vendor_sched, sysfs_type, fs_type;
-userdebug_or_eng(`
- typeattribute sysfs_vendor_sched mlstrustedobject;
-')
-type proc_vendor_sched, proc_type, fs_type;
-
# GPS
type vendor_gps_file, file_type, data_file_type;
userdebug_or_eng(`
diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts
index d04d3ab..71864a0 100644
--- a/whitechapel/vendor/google/file_contexts
+++ b/whitechapel/vendor/google/file_contexts
@@ -328,7 +328,6 @@
/vendor/bin/securedpud.slider u:object_r:securedpud_slider_exec:s0
/vendor/bin/storageproxyd u:object_r:tee_exec:s0
/vendor/bin/trusty_apploader u:object_r:trusty_apploader_exec:s0
-/vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0
/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.trusty u:object_r:hal_gatekeeper_default_exec:s0
/vendor/bin/hw/android\.hardware\.keymaster@4\.0-service\.trusty u:object_r:hal_keymaster_default_exec:s0
/vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty u:object_r:hal_keymint_default_exec:s0
diff --git a/whitechapel/vendor/google/genfs_contexts b/whitechapel/vendor/google/genfs_contexts
index 2173754..4fcd1ab 100644
--- a/whitechapel/vendor/google/genfs_contexts
+++ b/whitechapel/vendor/google/genfs_contexts
@@ -207,6 +207,7 @@
genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-7/7-0069/power_supply/dc/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-7/7-0069/power_supply/gcpm/wakeup u:object_r:sysfs_wakeup:s0
genfscon sysfs /devices/platform/10d50000.hsi2c/i2c-7/7-0036/power_supply/maxfg/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/google,usbc_port_cooling_dev/wakeup/wakeup u:object_r:sysfs_wakeup:s0
# OTA
genfscon sysfs /devices/platform/14700000.ufs/pixel/boot_lun_enabled u:object_r:sysfs_ota:s0