From 2293f5eb0b9d3289df575f7608240032c0d2c0cb Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Fri, 9 Dec 2022 22:23:14 +0000 Subject: [PATCH] Add all supported instance names for audio IModule In AIDL, there is no 'factory' interface for retrieving modules, instead each module is registered individually with the ServiceManager. Bug: 205884982 Test: atest VtsHalAudioCoreTargetTest Change-Id: I55cdae0640171379cda33de1534a8dc887583197 --- build/soong/service_fuzzer_bindings.go | 7 +++++++ private/service_contexts | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/build/soong/service_fuzzer_bindings.go b/build/soong/service_fuzzer_bindings.go index 2ee0ae2ba..97ba9a81d 100644 --- a/build/soong/service_fuzzer_bindings.go +++ b/build/soong/service_fuzzer_bindings.go @@ -25,6 +25,13 @@ var ( ServiceFuzzerBindings = map[string][]string{ "android.hardware.audio.core.IConfig/default": EXCEPTION_NO_FUZZER, "android.hardware.audio.core.IModule/default": EXCEPTION_NO_FUZZER, + "android.hardware.audio.core.IModule/a2dp": EXCEPTION_NO_FUZZER, + "android.hardware.audio.core.IModule/bluetooth": EXCEPTION_NO_FUZZER, + "android.hardware.audio.core.IModule/hearing_aid": EXCEPTION_NO_FUZZER, + "android.hardware.audio.core.IModule/msd": EXCEPTION_NO_FUZZER, + "android.hardware.audio.core.IModule/r_submix": EXCEPTION_NO_FUZZER, + "android.hardware.audio.core.IModule/stub": EXCEPTION_NO_FUZZER, + "android.hardware.audio.core.IModule/usb": EXCEPTION_NO_FUZZER, "android.hardware.audio.effect.IFactory/default": EXCEPTION_NO_FUZZER, "android.hardware.authsecret.IAuthSecret/default": EXCEPTION_NO_FUZZER, "android.hardware.automotive.evs.IEvsEnumerator/hw/0": EXCEPTION_NO_FUZZER, diff --git a/private/service_contexts b/private/service_contexts index e9fc83cbd..b78dba63e 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -1,7 +1,15 @@ android.frameworks.stats.IStats/default u:object_r:fwk_stats_service:s0 android.frameworks.sensorservice.ISensorManager/default u:object_r:fwk_sensor_service:s0 android.hardware.audio.core.IConfig/default u:object_r:hal_audio_service:s0 +# 'default' IModule is equivalent to 'primary' in HIDL android.hardware.audio.core.IModule/default u:object_r:hal_audio_service:s0 +android.hardware.audio.core.IModule/a2dp u:object_r:hal_audio_service:s0 +android.hardware.audio.core.IModule/bluetooth u:object_r:hal_audio_service:s0 +android.hardware.audio.core.IModule/hearing_aid u:object_r:hal_audio_service:s0 +android.hardware.audio.core.IModule/msd u:object_r:hal_audio_service:s0 +android.hardware.audio.core.IModule/r_submix u:object_r:hal_audio_service:s0 +android.hardware.audio.core.IModule/stub u:object_r:hal_audio_service:s0 +android.hardware.audio.core.IModule/usb u:object_r:hal_audio_service:s0 android.hardware.audio.effect.IFactory/default u:object_r:hal_audio_service:s0 android.hardware.authsecret.IAuthSecret/default u:object_r:hal_authsecret_service:s0 android.hardware.automotive.evs.IEvsEnumerator/hw/0 u:object_r:hal_evs_service:s0