From 5de9bdae50ba25095b28b88e9e81acdaf4df84b7 Mon Sep 17 00:00:00 2001 From: pix106 Date: Fri, 30 Jul 2021 18:10:45 +0200 Subject: [PATCH] Revert "sdm660-common: sepolicy: Adjust sepolicy for qti thermal" This reverts commit 77c4792ac9364166523b0c32164de2fe3736aad1. --- sepolicy/vendor/hal_thermal_default.te | 8 -------- sepolicy/vendor/property.te | 2 +- sepolicy/vendor/property_contexts | 3 ++- sepolicy/vendor/thermal-engine.te | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 sepolicy/vendor/hal_thermal_default.te diff --git a/sepolicy/vendor/hal_thermal_default.te b/sepolicy/vendor/hal_thermal_default.te deleted file mode 100644 index 2ccabe49..00000000 --- a/sepolicy/vendor/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/sepolicy/vendor/property.te b/sepolicy/vendor/property.te index 88bbecba..ab0f8552 100644 --- a/sepolicy/vendor/property.te +++ b/sepolicy/vendor/property.te @@ -10,4 +10,4 @@ type dirac_prop, property_type; type vendor_power_prop, property_type; # Thermal engine -type vendor_thermal_prop, property_type; +type thermal_engine_prop, property_type; diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index b5e88296..826ee824 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -53,4 +53,5 @@ ro.build.software.version u:object_r:exported_radio_prop:s0 ro.product.mod_device u:object_r:exported_radio_prop:s0 # Thermal engine -vendor.thermal.config u:object_r:vendor_thermal_prop:s0 +persist.sys.thermal. u:object_r:thermal_engine_prop:s0 +sys.thermal. u:object_r:thermal_engine_prop:s0 diff --git a/sepolicy/vendor/thermal-engine.te b/sepolicy/vendor/thermal-engine.te index ca721efe..0b26efeb 100644 --- a/sepolicy/vendor/thermal-engine.te +++ b/sepolicy/vendor/thermal-engine.te @@ -3,7 +3,7 @@ allow thermal-engine thermal_data_file:file create_file_perms; allow thermal-engine sysfs:dir r_dir_perms; allow thermal-engine self:capability { chown fowner }; -set_prop(thermal-engine, vendor_thermal_prop); +set_prop(thermal-engine, thermal_engine_prop); r_dir_file(thermal-engine, sysfs_thermal) dontaudit thermal-engine self:capability dac_override;