diff --git a/private/compat/32.0/32.0.ignore.cil b/private/compat/32.0/32.0.ignore.cil index d1ff7cd27..f1307ad44 100644 --- a/private/compat/32.0/32.0.ignore.cil +++ b/private/compat/32.0/32.0.ignore.cil @@ -19,8 +19,6 @@ diced diced_exec fwk_automotive_display_service - evsmanagerd - evsmanagerd_service extra_free_kbytes extra_free_kbytes_exec fs_bpf_vendor diff --git a/private/evsmanagerd.te b/private/evsmanagerd.te deleted file mode 100644 index 37726287f..000000000 --- a/private/evsmanagerd.te +++ /dev/null @@ -1,39 +0,0 @@ -# evsmanager -typeattribute evsmanagerd coredomain; -typeattribute evsmanagerd evsmanager_service_server; - -type evsmanagerd_exec, system_file_type, exec_type, file_type; - -init_daemon_domain(evsmanagerd); - -# Declares as a binder service -binder_service(evsmanagerd) - -# Allows to add a service to service_manager -add_service(evsmanagerd, evsmanagerd_service) - -# Allows to use the binder IPC -binder_use(evsmanagerd) - -# Allows binder IPCs to the various system services -binder_call(evsmanagerd, system_server) - -# Allows to use EVS HAL implementations -hal_client_domain(evsmanagerd, hal_evs) - -# Allows to write messages to the shell -allow evsmanagerd shell:fd use; -allow evsmanagerd shell:fifo_file write; - -# Allows to use the graphics allocator -allow evsmanagerd hal_graphics_allocator:fd use; - -# Allows to use a bootstrap statsd -allow evsmanagerd statsbootstrap_service:service_manager find; - -# Allows binder IPCs to the CarService -binder_call(evsmanagerd, appdomain) - -# For HIDL evs manager implementation -allow evsmanagerd hal_evs_hwservice:hwservice_manager add; -allow evsmanagerd hidl_base_hwservice:hwservice_manager add; diff --git a/private/file_contexts b/private/file_contexts index fabbf2b37..ba5037695 100644 --- a/private/file_contexts +++ b/private/file_contexts @@ -377,8 +377,6 @@ /system/bin/odsign u:object_r:odsign_exec:s0 /system/bin/vehicle_binding_util u:object_r:vehicle_binding_util_exec:s0 /system/bin/cardisplayproxyd u:object_r:automotive_display_service_exec:s0 -/system/bin/evsmanagerd u:object_r:evsmanagerd_exec:s0 -/system/bin/android\.automotive\.evs\.manager@1\.[0-9]+ u:object_r:evsmanagerd_exec:s0 ############################# # Vendor files diff --git a/private/service_contexts b/private/service_contexts index dfd779582..7075f4d47 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -75,7 +75,6 @@ aidl_lazy_test_1 u:object_r:aidl_lazy_test_service:s0 aidl_lazy_test_2 u:object_r:aidl_lazy_test_service:s0 aidl_lazy_cb_test u:object_r:aidl_lazy_test_service:s0 alarm u:object_r:alarm_service:s0 -android.hardware.automotive.evs.IEvsEnumerator/default u:object_r:evsmanagerd_service:s0 android.os.UpdateEngineService u:object_r:update_engine_service:s0 android.os.UpdateEngineStableService u:object_r:update_engine_stable_service:s0 android.frameworks.automotive.display.ICarDisplayProxy/default u:object_r:fwk_automotive_display_service:s0 diff --git a/public/attributes b/public/attributes index 4db8ba13d..73861bdf4 100644 --- a/public/attributes +++ b/public/attributes @@ -398,7 +398,6 @@ hal_attribute(wifi_supplicant); attribute automotive_display_service_server; attribute camera_service_server; attribute display_service_server; -attribute evsmanager_service_server; attribute scheduler_service_server; attribute sensor_service_server; attribute stats_service_server; diff --git a/public/evsmanagerd.te b/public/evsmanagerd.te deleted file mode 100644 index cde0380cc..000000000 --- a/public/evsmanagerd.te +++ /dev/null @@ -1,2 +0,0 @@ -# evsmanager daemon -type evsmanagerd, domain; diff --git a/public/hal_evs.te b/public/hal_evs.te index e5e5fceda..789333af7 100644 --- a/public/hal_evs.te +++ b/public/hal_evs.te @@ -1,12 +1,5 @@ hwbinder_use(hal_evs_client) hwbinder_use(hal_evs_server) - binder_call(hal_evs_client, hal_evs_server) binder_call(hal_evs_server, hal_evs_client) - -# Below lines are equivalent to hal_attribute_hwservice(hal_evs, hal_evs_hwservice) -# except it allows evsmanagerd to add hal_evs_hwservice. -allow hal_evs_client hal_evs_hwservice:hwservice_manager find; -allow hal_evs_server hal_evs_hwservice:hwservice_manager { add find }; -allow hal_evs_server hidl_base_hwservice:hwservice_manager add; -neverallow { domain -hal_evs_server -evsmanagerd } hal_evs_hwservice:hwservice_manager add; +hal_attribute_hwservice(hal_evs, hal_evs_hwservice) diff --git a/public/service.te b/public/service.te index 495b5f5a1..46eaff17a 100644 --- a/public/service.te +++ b/public/service.te @@ -13,7 +13,6 @@ type dice_node_service, service_manager_type; type dnsresolver_service, service_manager_type; type drmserver_service, service_manager_type; type dumpstate_service, service_manager_type; -type evsmanagerd_service, service_manager_type; type fingerprintd_service, service_manager_type; type fwk_automotive_display_service, service_manager_type; type gatekeeper_service, app_api_service, service_manager_type;