From cc7de177ec438c410f14ff814aae0904dae5a3bd Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 27 Oct 2021 10:51:29 -0700 Subject: [PATCH] Remove bufferhub HAL policy. The bufferhub daemon policy still remains, since it still needs to be deleted. However, since the HAL no longer exists, removing policy related to this. Bug: 204068144 Test: build only Change-Id: I96b96c77a39e2ba2024680ebaf3067283d0cfc65 --- private/fwk_bufferhub.te | 1 - private/surfaceflinger.te | 1 - private/technical_debt.cil | 5 ----- public/attributes | 1 - public/fwk_bufferhub.te | 4 ---- 5 files changed, 12 deletions(-) delete mode 100644 public/fwk_bufferhub.te diff --git a/private/fwk_bufferhub.te b/private/fwk_bufferhub.te index 6b69cca61..5286f3e56 100644 --- a/private/fwk_bufferhub.te +++ b/private/fwk_bufferhub.te @@ -4,5 +4,4 @@ type fwk_bufferhub_exec, system_file_type, exec_type, file_type; hal_client_domain(fwk_bufferhub, hal_graphics_allocator) allow fwk_bufferhub ion_device:chr_file r_file_perms; -hal_server_domain(fwk_bufferhub, hal_bufferhub) init_daemon_domain(fwk_bufferhub) diff --git a/private/surfaceflinger.te b/private/surfaceflinger.te index e88efd097..1c7f657af 100644 --- a/private/surfaceflinger.te +++ b/private/surfaceflinger.te @@ -19,7 +19,6 @@ hal_client_domain(surfaceflinger, hal_codec2) hal_client_domain(surfaceflinger, hal_omx) hal_client_domain(surfaceflinger, hal_configstore) hal_client_domain(surfaceflinger, hal_power) -hal_client_domain(surfaceflinger, hal_bufferhub) allow surfaceflinger hidl_token_hwservice:hwservice_manager find; # Perform Binder IPC. diff --git a/private/technical_debt.cil b/private/technical_debt.cil index 9b3e3c6ad..4c746fbd9 100644 --- a/private/technical_debt.cil +++ b/private/technical_debt.cil @@ -59,11 +59,6 @@ (typeattribute untrusted_app_visible_halserver) (typeattributeset untrusted_app_visible_halserver_violators (untrusted_app_visible_halserver)) -; Apps, except isolated apps, are clients of BufferHub HAL -; Unfortunately, we can't currently express this in module policy language: -; typeattribute { appdomain -isolated_app } hal_cas_client; -(typeattributeset hal_bufferhub_client ((and (appdomain) ((not (isolated_app)))))) - ; Properties having both system_property_type and vendor_property_type are illegal ; Unfortunately, we can't currently express this in module policy language: ; typeattribute { system_property_type && vendor_property_type } system_and_vendor_property_type; diff --git a/public/attributes b/public/attributes index 32fe98c44..6c37db190 100644 --- a/public/attributes +++ b/public/attributes @@ -324,7 +324,6 @@ hal_attribute(audiocontrol); hal_attribute(authsecret); hal_attribute(bluetooth); hal_attribute(bootctl); -hal_attribute(bufferhub); hal_attribute(broadcastradio); hal_attribute(camera); hal_attribute(can_bus); diff --git a/public/fwk_bufferhub.te b/public/fwk_bufferhub.te deleted file mode 100644 index 03486bd1e..000000000 --- a/public/fwk_bufferhub.te +++ /dev/null @@ -1,4 +0,0 @@ -binder_call(hal_bufferhub_client, hal_bufferhub_server) -binder_call(hal_bufferhub_server, hal_bufferhub_client) - -hal_attribute_hwservice(hal_bufferhub, fwk_bufferhub_hwservice)