From 40eb67e0f1be8c90f41918ebcf0eda32234b3d5e Mon Sep 17 00:00:00 2001 From: Benjamin Schwartz Date: Wed, 5 Aug 2020 09:14:57 -0700 Subject: [PATCH] Fix sepolicy name conflict Need to distinguish between power stats hal's main service and the vendor service that it runs to provide an AIDL interface to other userspace stats providers. This also uncovered a problem where con_monitor_app was not labeled as coredomain. Bug: 162472196 Bug: 162964335 Test: m Merged-In: I7e325375a2e34aec84cdb8176ab6fd3036bce311 Change-Id: Ie436cf0362a5e63446a325471b2a8a7722dd74dd --- sepolicy/vendor/con_monitor.te | 2 +- sepolicy/vendor/hal_power_stats_default.te | 4 ---- sepolicy/vendor/vndservice.te | 1 - sepolicy/vendor/vndservice_contexts | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/sepolicy/vendor/con_monitor.te b/sepolicy/vendor/con_monitor.te index eeb6bf5e..c2388174 100644 --- a/sepolicy/vendor/con_monitor.te +++ b/sepolicy/vendor/con_monitor.te @@ -1,5 +1,5 @@ # ConnectivityMonitor app -type con_monitor_app, domain; +type con_monitor_app, domain, coredomain; app_domain(con_monitor_app) diff --git a/sepolicy/vendor/hal_power_stats_default.te b/sepolicy/vendor/hal_power_stats_default.te index d3056de9..02832235 100644 --- a/sepolicy/vendor/hal_power_stats_default.te +++ b/sepolicy/vendor/hal_power_stats_default.te @@ -6,7 +6,3 @@ get_prop(hal_power_stats_default, wifi_hal_prop) # Needed to detect wifi on/off # power.stats HAL needs access to the easel sysfs node r_dir_file(hal_power_stats_default, sysfs_easel) -# Allow power.stats HAL to add the power_stats_service -vndbinder_use(hal_power_stats) -add_service(hal_power_stats_server, power_stats_service) - diff --git a/sepolicy/vendor/vndservice.te b/sepolicy/vendor/vndservice.te index 75ac8e19..47886335 100644 --- a/sepolicy/vendor/vndservice.te +++ b/sepolicy/vendor/vndservice.te @@ -1,4 +1,3 @@ type qdisplay_service, vndservice_manager_type; type per_mgr_service, vndservice_manager_type; -type power_stats_service, vndservice_manager_type; diff --git a/sepolicy/vendor/vndservice_contexts b/sepolicy/vendor/vndservice_contexts index 5ad35d6c..1db4aa0c 100644 --- a/sepolicy/vendor/vndservice_contexts +++ b/sepolicy/vendor/vndservice_contexts @@ -1,4 +1,2 @@ display.qservice u:object_r:qdisplay_service:s0 vendor.qcom.PeripheralManager u:object_r:per_mgr_service:s0 -power.stats-vendor u:object_r:power_stats_service:s0 -