From 8d72ba4fedd4404d47c398253ef973ab48b7720f Mon Sep 17 00:00:00 2001 From: Vaisakh Murali Date: Wed, 5 Oct 2022 20:43:23 +0100 Subject: [PATCH] rosemary: Rename all powerhal props to avoid sepolicy conflicts MTK labels the vendor.powerhal prop as with their own context, but using the same contexts leads to more error. Instead switch to a different prop naming which will not conflict with MTK context. Signed-off-by: Vaisakh Murali Change-Id: I1dd8f85a4170917bcd8dacbef4f5086931bc7352 --- sepolicy/vendor/hal_power_default.te | 2 +- sepolicy/vendor/property.te | 1 + sepolicy/vendor/property_contexts | 3 +++ sepolicy/vendor/vendor_init.te | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sepolicy/vendor/hal_power_default.te b/sepolicy/vendor/hal_power_default.te index d99e842..9bfc67f 100644 --- a/sepolicy/vendor/hal_power_default.te +++ b/sepolicy/vendor/hal_power_default.te @@ -4,7 +4,7 @@ allow hal_power_default sysfs_devices_system_cpu:file rw_file_perms; allow hal_power_default cgroup:file r_file_perms; # To get/set powerhal state property -set_prop(hal_power_default, vendor_mtk_powerhal_prop) +set_prop(hal_power_default, vendor_power_prop) # Rule for hal_power_default to access graphics composer process unix_socket_connect(hal_power_default, pps, hal_graphics_composer_default); diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te index acac033..157d037 100644 --- a/sepolicy/vendor/property.te +++ b/sepolicy/vendor/property.te @@ -1,4 +1,5 @@ vendor_restricted_prop(vendor_fingerprint_prop); +vendor_internal_prop(vendor_power_prop) # IR vendor_restricted_prop(vendor_lirc_prop); diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index 12e2f9d..0b7162d 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -29,5 +29,8 @@ vendor.fps_hal. u:object_r:vendor_finger # IR ro.lirc.dev u:object_r:vendor_lirc_prop:s0 +# Power +vendor.mediatek.powerhal. u:object_r:vendor_power_prop:s0 + # Thermal vendor.sys.thermal. u:object_r:thermal_engine_prop:s0 diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te index 776a6ee..6e86a83 100644 --- a/sepolicy/vendor/vendor_init.te +++ b/sepolicy/vendor/vendor_init.te @@ -6,4 +6,4 @@ allow vendor_init nfc_data_vendor_file:dir { r_dir_perms create_dir_perms }; allow vendor_init proc_sched_stune:file w_file_perms; allow vendor_init proc_vm_dirty:file w_file_perms; -set_prop(vendor_init, vendor_mtk_powerhal_prop) +set_prop(vendor_init, vendor_power_prop)