diff --git a/build/soong/service_fuzzer_bindings.go b/build/soong/service_fuzzer_bindings.go index 5555469c2..c799f2ebb 100644 --- a/build/soong/service_fuzzer_bindings.go +++ b/build/soong/service_fuzzer_bindings.go @@ -33,6 +33,7 @@ var ( "android.hardware.broadcastradio.IBroadcastRadio/amfm": []string{}, "android.hardware.broadcastradio.IBroadcastRadio/dab": []string{}, "android.hardware.camera.provider.ICameraProvider/internal/0": []string{}, + "android.hardware.cas.IMediaCasService/default": []string{}, "android.hardware.confirmationui.IConfirmationUI/default": []string{}, "android.hardware.contexthub.IContextHub/default": []string{}, "android.hardware.drm.IDrmFactory/clearkey": []string{}, diff --git a/private/compat/33.0/33.0.ignore.cil b/private/compat/33.0/33.0.ignore.cil index 39a4bdc37..35316e38f 100644 --- a/private/compat/33.0/33.0.ignore.cil +++ b/private/compat/33.0/33.0.ignore.cil @@ -12,6 +12,7 @@ device_config_vendor_system_native_prop devicelock_service hal_bootctl_service + hal_cas_service hal_remoteaccess_service hal_thermal_service hal_tv_input_service diff --git a/private/service_contexts b/private/service_contexts index 7d980f284..784affd9a 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -18,6 +18,7 @@ android.hardware.broadcastradio.IBroadcastRadio/dab u:object_r: # The instance here is internal/0 following naming convention for ICameraProvider. # It advertises internal camera devices. android.hardware.camera.provider.ICameraProvider/internal/0 u:object_r:hal_camera_service:s0 +android.hardware.cas.IMediaCasService/default u:object_r:hal_cas_service:s0 android.hardware.confirmationui.IConfirmationUI/default u:object_r:hal_confirmationui_service:s0 android.hardware.contexthub.IContextHub/default u:object_r:hal_contexthub_service:s0 android.hardware.drm.IDrmFactory/clearkey u:object_r:hal_drm_service:s0 diff --git a/public/hal_cas.te b/public/hal_cas.te index e699a6bac..056b4c998 100644 --- a/public/hal_cas.te +++ b/public/hal_cas.te @@ -5,6 +5,11 @@ binder_call(hal_cas_server, hal_cas_client) hal_attribute_hwservice(hal_cas, hal_cas_hwservice) allow hal_cas_server hidl_memory_hwservice:hwservice_manager find; +hal_attribute_service(hal_cas, hal_cas_service) + +binder_call(hal_cas_server, servicemanager) +binder_call(hal_cas_client, servicemanager) + # Permit reading device's serial number from system properties get_prop(hal_cas_server, serialno_prop) diff --git a/public/service.te b/public/service.te index 70ddf94f1..2b57d9907 100644 --- a/public/service.te +++ b/public/service.te @@ -273,6 +273,7 @@ type hal_authsecret_service, protected_service, hal_service_type, service_manage type hal_bootctl_service, protected_service, hal_service_type, service_manager_type; type hal_broadcastradio_service, protected_service, hal_service_type, service_manager_type; type hal_camera_service, protected_service, hal_service_type, service_manager_type; +type hal_cas_service, hal_service_type, service_manager_type; type hal_confirmationui_service, protected_service, hal_service_type, service_manager_type; type hal_contexthub_service, protected_service, hal_service_type, service_manager_type; type hal_dice_service, protected_service, hal_service_type, service_manager_type; diff --git a/vendor/file_contexts b/vendor/file_contexts index c214f4ec5..150077126 100644 --- a/vendor/file_contexts +++ b/vendor/file_contexts @@ -40,6 +40,8 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.drm-service(-lazy)?\.clearkey u:object_r:hal_drm_clearkey_aidl_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.cas@1\.[0-2]-service u:object_r:hal_cas_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.cas@1\.[0-2]-service-lazy u:object_r:hal_cas_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.cas-service\.example u:object_r:hal_cas_default_exec:s0 +/(vendor|system/vendor)/bin/hw/android\.hardware\.cas-service\.example-lazy u:object_r:hal_cas_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.dumpstate@1\.[0-1]-service\.example u:object_r:hal_dumpstate_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.dumpstate-service\.example u:object_r:hal_dumpstate_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.gatekeeper@1\.0-service u:object_r:hal_gatekeeper_default_exec:s0