From 8c48cfa8330936a0535dda8ec27ec9f52c3691fd Mon Sep 17 00:00:00 2001 From: EcrosoftXiao Date: Fri, 19 Jul 2024 12:56:42 +0530 Subject: [PATCH] sm6375-common: Switch to Thermal 2.0 mock * QTI Thermal couldn't read the temperature for some reason * sepolicy: Adjust sepolicy for thermal Change-Id: Idea1bcdea070913ef35b699fafd1242d740453a9 --- common.mk | 2 +- sepolicy/vendor/file_contexts | 1 + sepolicy/vendor/hal_thermal_default.te | 8 ++++++++ sepolicy/vendor/property.te | 3 +++ sepolicy/vendor/property_contexts | 3 +++ sepolicy/vendor/thermal-engine.te | 7 +++++++ sepolicy/vendor/vendor_thermal-engine.te | 4 ---- 7 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 sepolicy/vendor/hal_thermal_default.te create mode 100644 sepolicy/vendor/thermal-engine.te delete mode 100644 sepolicy/vendor/vendor_thermal-engine.te diff --git a/common.mk b/common.mk index 018ba83..45c6d73 100644 --- a/common.mk +++ b/common.mk @@ -465,7 +465,7 @@ PRODUCT_COPY_FILES += \ # Thermal PRODUCT_PACKAGES += \ - android.hardware.thermal@2.0-service.qti \ + android.hardware.thermal@2.0-service.mock \ android.hardware.thermal@2.0 \ android.hardware.thermal@2.0.vendor diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 1d2f0dd..73668ed 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -92,6 +92,7 @@ # Thermal /dev/mmi_sys_temp u:object_r:vendor_thermal_device:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.thermal@2\.0-service\.mock u:object_r:hal_thermal_default_exec:s0 # Vendor init scripts /(vendor|system/vendor)/bin/load_touch\.sh u:object_r:vendor_qti_init_shell_exec:s0 diff --git a/sepolicy/vendor/hal_thermal_default.te b/sepolicy/vendor/hal_thermal_default.te new file mode 100644 index 0000000..2ccabe4 --- /dev/null +++ b/sepolicy/vendor/hal_thermal_default.te @@ -0,0 +1,8 @@ +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/sepolicy/vendor/property.te b/sepolicy/vendor/property.te index 0615a13..fad158a 100644 --- a/sepolicy/vendor/property.te +++ b/sepolicy/vendor/property.te @@ -8,3 +8,6 @@ vendor_internal_prop(vendor_mot_nfc_prop); # Power vendor_internal_prop(vendor_power_prop) + +# Thermal engine +vendor_internal_prop(vendor_thermal_prop) diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index 5e11189..90f1a9e 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -24,3 +24,6 @@ vendor.hw.fingerprint.status u:object_r:vendor_mot_fingerprint # Power vendor.powerhal. u:object_r:vendor_power_prop:s0 + +# Thermal engine +vendor.thermal.config u:object_r:vendor_thermal_prop:s0 diff --git a/sepolicy/vendor/thermal-engine.te b/sepolicy/vendor/thermal-engine.te new file mode 100644 index 0000000..7791706 --- /dev/null +++ b/sepolicy/vendor/thermal-engine.te @@ -0,0 +1,7 @@ +allow vendor_thermal-engine { proc_stat proc_loadavg }:file r_file_perms; +allow vendor_thermal-engine vendor_thermal_device:chr_file rw_file_perms; +rw_dir_file(vendor_thermal-engine, vendor_sysfs_battery_supply) +rw_dir_file(vendor_thermal-engine, vendor_sysfs_usb_supply) + +set_prop(vendor_thermal-engine, vendor_thermal_prop); +r_dir_file(vendor_thermal-engine, sysfs_thermal) diff --git a/sepolicy/vendor/vendor_thermal-engine.te b/sepolicy/vendor/vendor_thermal-engine.te deleted file mode 100644 index b76e121..0000000 --- a/sepolicy/vendor/vendor_thermal-engine.te +++ /dev/null @@ -1,4 +0,0 @@ -allow vendor_thermal-engine { proc_stat proc_loadavg }:file r_file_perms; -allow vendor_thermal-engine vendor_thermal_device:chr_file rw_file_perms; -r_dir_file(vendor_thermal-engine, vendor_sysfs_battery_supply) -r_dir_file(vendor_thermal-engine, vendor_sysfs_usb_supply)