diff options
Diffstat (limited to 'audio/common/all-versions/default/service/service.cpp')
| -rw-r--r-- | audio/common/all-versions/default/service/service.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/audio/common/all-versions/default/service/service.cpp b/audio/common/all-versions/default/service/service.cpp index bf78a43ef8..65ad4acc8a 100644 --- a/audio/common/all-versions/default/service/service.cpp +++ b/audio/common/all-versions/default/service/service.cpp @@ -19,9 +19,11 @@ #include <android/hardware/audio/2.0/IDevicesFactory.h> #include <android/hardware/audio/4.0/IDevicesFactory.h> #include <android/hardware/audio/5.0/IDevicesFactory.h> +#include <android/hardware/audio/6.0/IDevicesFactory.h> #include <android/hardware/audio/effect/2.0/IEffectsFactory.h> #include <android/hardware/audio/effect/4.0/IEffectsFactory.h> #include <android/hardware/audio/effect/5.0/IEffectsFactory.h> +#include <android/hardware/audio/effect/6.0/IEffectsFactory.h> #include <android/hardware/bluetooth/a2dp/1.0/IBluetoothAudioOffload.h> #include <android/hardware/bluetooth/audio/2.0/IBluetoothAudioProvidersFactory.h> #include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h> @@ -74,16 +76,22 @@ int main(int /* argc */, char* /* argv */ []) { } configureRpcThreadpool(16, true /*callerWillJoin*/); - LOG_ALWAYS_FATAL_IF((registerPassthroughServiceImplementations<audio::V5_0::IDevicesFactory, - audio::V4_0::IDevicesFactory, - audio::V2_0::IDevicesFactory>()), + // Keep versions on a separate line for easier parsing + // clang-format off + LOG_ALWAYS_FATAL_IF((registerPassthroughServiceImplementations< + audio::V6_0::IDevicesFactory, + audio::V5_0::IDevicesFactory, + audio::V4_0::IDevicesFactory, + audio::V2_0::IDevicesFactory>()), "Could not register audio core API"); - LOG_ALWAYS_FATAL_IF( - (registerPassthroughServiceImplementations<audio::effect::V5_0::IEffectsFactory, - audio::effect::V4_0::IEffectsFactory, - audio::effect::V2_0::IEffectsFactory>()), - "Could not register audio effect API"); + LOG_ALWAYS_FATAL_IF((registerPassthroughServiceImplementations< + audio::effect::V6_0::IEffectsFactory, + audio::effect::V5_0::IEffectsFactory, + audio::effect::V4_0::IEffectsFactory, + audio::effect::V2_0::IEffectsFactory>()), + "Could not register audio effect API"); + // clang-format on ALOGW_IF((registerPassthroughServiceImplementations<soundtrigger::V2_2::ISoundTriggerHw, soundtrigger::V2_1::ISoundTriggerHw, |