thermal: move thermal-hal selinux policy to Pixel-wide folder
Bug: 146390555
Test: No avc denied and thermal_logd can print when thermal-hal ativates
Change-Id: I2f779a49e3dbd2b713ecbf807460b0645b30cb5f
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index d1e6f8b..a58493a 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -28,7 +28,6 @@
/vendor/bin/hw/android\.hardware\.oemlock@1\.0-service\.citadel u:object_r:hal_oemlock_citadel_exec:s0
/vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.pixel u:object_r:hal_power_stats_default_exec:s0
/vendor/bin/hw/android\.hardware\.power@1\.3-service\.pixel-libperfmgr u:object_r:hal_power_default_exec:s0
-/vendor/bin/hw/android\.hardware\.thermal@2\.0-service\.pixel u:object_r:hal_thermal_default_exec:s0
/vendor/bin/hw/android\.hardware\.weaver@1\.0-service\.citadel u:object_r:hal_weaver_citadel_exec:s0
/vendor/bin/hw/citadeld u:object_r:citadeld_exec:s0
/vendor/bin/hw/init_citadel u:object_r:init_citadel_exec:s0
@@ -40,7 +39,6 @@
/vendor/bin/color_init u:object_r:color_init_exec:s0
/vendor/bin/init\.ramoops\.sh u:object_r:ramoops_exec:s0
/vendor/bin/modem_svc u:object_r:modem_svc_exec:s0
-/vendor/bin/thermal_logd u:object_r:init-thermal-logging-sh_exec:s0
/vendor/bin/ramoops u:object_r:ramoops_exec:s0
/vendor/bin/ramdump u:object_r:ramdump_exec:s0
/vendor/bin/rlsservice u:object_r:rlsservice_exec:s0
diff --git a/vendor/google/hal_thermal_default.te b/vendor/google/hal_thermal_default.te
deleted file mode 100644
index 55073a9..0000000
--- a/vendor/google/hal_thermal_default.te
+++ /dev/null
@@ -1,8 +0,0 @@
-allow hal_thermal_default sysfs_thermal:dir r_dir_perms;
-allow hal_thermal_default sysfs_thermal:file rw_file_perms;
-allow hal_thermal_default proc_stat:file r_file_perms;
-
-allow hal_thermal_default self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-
-# read thermal_config
-get_prop(hal_thermal_default, vendor_thermal_prop)
diff --git a/vendor/google/init-thermal-logging.sh.te b/vendor/google/init-thermal-logging.sh.te
deleted file mode 100644
index 3da540e..0000000
--- a/vendor/google/init-thermal-logging.sh.te
+++ /dev/null
@@ -1,10 +0,0 @@
-type init-thermal-logging-sh, domain;
-type init-thermal-logging-sh_exec, exec_type, vendor_file_type, file_type;
-
-init_daemon_domain(init-thermal-logging-sh)
-
-userdebug_or_eng(`
- allow init-thermal-logging-sh vendor_toolbox_exec:file rx_file_perms;
- allow init-thermal-logging-sh sysfs_thermal:dir r_dir_perms;
- allow init-thermal-logging-sh sysfs_thermal:file r_file_perms;
-')
diff --git a/vendor/google/property.te b/vendor/google/property.te
index 54aa455..26cf835 100644
--- a/vendor/google/property.te
+++ b/vendor/google/property.te
@@ -1,4 +1,3 @@
-type vendor_thermal_prop, property_type;
type power_prop, property_type;
type vendor_tcpdump_log_prop, property_type;
type vendor_build_type_prop, property_type;
diff --git a/vendor/google/property_contexts b/vendor/google/property_contexts
index cea3598..aac2592 100644
--- a/vendor/google/property_contexts
+++ b/vendor/google/property_contexts
@@ -11,8 +11,6 @@
persist.audio.fluence.voicecomm u:object_r:vendor_audio_prop:s0
audio.adm.buffering.ms u:object_r:vendor_audio_prop:s0
-vendor.thermal.config u:object_r:vendor_thermal_prop:s0
-
ro.boot.usbcontroller u:object_r:vendor_usb_prop:s0
ro.boot.hardware.platform u:object_r:public_vendor_default_prop:s0
diff --git a/vendor/google/vendor_init.te b/vendor/google/vendor_init.te
index e40388b..e9aeecf 100644
--- a/vendor/google/vendor_init.te
+++ b/vendor/google/vendor_init.te
@@ -8,7 +8,6 @@
get_prop(vendor_init, public_vendor_default_prop)
set_prop(vendor_init, vendor_build_type_prop)
set_prop(vendor_init, vendor_ssr_prop)
-set_prop(vendor_init, vendor_thermal_prop)
set_prop(vendor_init, vendor_display_prop)
set_prop(vendor_init, vendor_hvdcp_opti_prop)
set_prop(vendor_init, vendor_audio_prop)
diff --git a/vendor/qcom/sm7250/genfs_contexts b/vendor/qcom/sm7250/genfs_contexts
index ce5a6da..99b8ef3 100644
--- a/vendor/qcom/sm7250/genfs_contexts
+++ b/vendor/qcom/sm7250/genfs_contexts
@@ -1,7 +1,5 @@
genfscon sysfs /module/subsystem_restart/parameters/enable_ramdumps u:object_r:sysfs_ssr:s0
genfscon sysfs /devices/platform/soc/3d00000.qcom,kgsl-3d0 u:object_r:sysfs_msm_subsys:s0
-genfscon sysfs /devices/virtual/thermal u:object_r:sysfs_thermal:s0
-genfscon sysfs /class/thermal u:object_r:sysfs_thermal:s0
genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm8150@0:qcom,pm8150_rtc/rtc u:object_r:sysfs_rtc:s0
