From 9616129e96c6045e3b8a30a96b918767298da170 Mon Sep 17 00:00:00 2001 From: Albert Tang Date: Wed, 25 May 2022 19:42:44 -0500 Subject: [PATCH] dre: Remove Iris display features Change-Id: I97fbae7764f15051dfab42f1a5b2b92c8879c60e --- sepolicy/vendor/attributes | 4 ---- sepolicy/vendor/file_contexts | 2 -- sepolicy/vendor/hal_display_iris.te | 4 ---- sepolicy/vendor/hal_graphics_composer_default.te | 5 ----- sepolicy/vendor/hwservice.te | 1 - sepolicy/vendor/hwservice_contexts | 2 -- 6 files changed, 18 deletions(-) delete mode 100644 sepolicy/vendor/hal_display_iris.te diff --git a/sepolicy/vendor/attributes b/sepolicy/vendor/attributes index 91fe148..b772f2e 100644 --- a/sepolicy/vendor/attributes +++ b/sepolicy/vendor/attributes @@ -11,10 +11,6 @@ attribute hal_display; attribute hal_display_client; attribute hal_display_server; -attribute hal_display_iris; -attribute hal_display_iris_client; -attribute hal_display_iris_server; - attribute hal_param; attribute hal_param_client; attribute hal_param_server; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index ad6ee2f..0043d1f 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -41,8 +41,6 @@ /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.charger@1\.0-service u:object_r:hal_charger_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.display@1\.0-service u:object_r:hal_display_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.oneplus\.hardware\.param@1\.0-service u:object_r:hal_param_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.pixelworks\.hardware\.display\.iris-service u:object_r:hal_graphics_composer_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.pixelworks\.hardware\.feature\.irisfeature-service u:object_r:hal_graphics_composer_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.qti\.hardware\.vibrator\.service\.oneplus u:object_r:hal_vibrator_default_exec:s0 # Init scripts diff --git a/sepolicy/vendor/hal_display_iris.te b/sepolicy/vendor/hal_display_iris.te deleted file mode 100644 index 5f95ce6..0000000 --- a/sepolicy/vendor/hal_display_iris.te +++ /dev/null @@ -1,4 +0,0 @@ -binder_call(hal_display_iris_client, hal_display_iris_server) -binder_call(hal_display_iris_server, hal_display_iris_client) - -hal_attribute_hwservice(hal_display_iris, hal_display_iris_hwservice) diff --git a/sepolicy/vendor/hal_graphics_composer_default.te b/sepolicy/vendor/hal_graphics_composer_default.te index b9d1e69..08b21f9 100644 --- a/sepolicy/vendor/hal_graphics_composer_default.te +++ b/sepolicy/vendor/hal_graphics_composer_default.te @@ -1,8 +1,3 @@ -hal_client_domain(hal_graphics_composer_default, hal_display_iris) -hal_server_domain(hal_graphics_composer_default, hal_display_iris) - -add_hwservice(hal_graphics_composer_default, hal_display_iris_hwservice) - allow hal_graphics_composer_default vendor_persist_file:file rw_file_perms; allow hal_graphics_composer_default sysfs_devices_system_cpu:file rw_file_perms; diff --git a/sepolicy/vendor/hwservice.te b/sepolicy/vendor/hwservice.te index 097a755..2f36a79 100644 --- a/sepolicy/vendor/hwservice.te +++ b/sepolicy/vendor/hwservice.te @@ -1,5 +1,4 @@ type hal_cameraHIDL_hwservice, hwservice_manager_type; type hal_charger_hwservice, hwservice_manager_type; type hal_display_hwservice, hwservice_manager_type; -type hal_display_iris_hwservice, hwservice_manager_type; type hal_param_hwservice, hwservice_manager_type; diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts index 42133b5..b35c26b 100644 --- a/sepolicy/vendor/hwservice_contexts +++ b/sepolicy/vendor/hwservice_contexts @@ -6,5 +6,3 @@ vendor.oneplus.hardware.CameraMDMHIDL::IOnePlusCameraMDM u:obj vendor.oneplus.hardware.charger::ICharger u:object_r:hal_charger_hwservice:s0 vendor.oneplus.hardware.display::IOneplusDisplay u:object_r:hal_display_hwservice:s0 vendor.oneplus.hardware.param::IOneplusParam u:object_r:hal_param_hwservice:s0 -vendor.pixelworks.hardware.display::IIris u:object_r:hal_display_iris_hwservice:s0 -vendor.pixelworks.hardware.feature::IIrisFeature u:object_r:hal_display_iris_hwservice:s0