diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-01-07 13:44:45 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2019-01-14 13:15:33 -0800 |
| commit | 547a28a4ba763c5c3e681948c59194ed1881e11b (patch) | |
| tree | 0585111e003b92ff21e6a1cf0a8e53a47007035b /audio/common/all-versions/default/service/service.cpp | |
| parent | ec9d5b0f32bd55ba10a77f264cbfd1db6a1d6fe5 (diff) | |
| parent | a2810e9506ca4b8e785eb1393f63b5cfa734d2c5 (diff) | |
Merge QP1A.190107.001
Conflicts:
wifi/1.3/default/wifi_chip.cpp
wifi/1.3/default/wifi_feature_flags.cpp
wifi/1.3/default/wifi_feature_flags.h
wifi/1.3/default/wifi_legacy_hal_stubs.cpp
Change-Id: Ia498209a96e10b7d50d4d1447de95898e0eaa08b
Diffstat (limited to 'audio/common/all-versions/default/service/service.cpp')
| -rw-r--r-- | audio/common/all-versions/default/service/service.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/audio/common/all-versions/default/service/service.cpp b/audio/common/all-versions/default/service/service.cpp index 9a2feb1162..10d4ed2e5c 100644 --- a/audio/common/all-versions/default/service/service.cpp +++ b/audio/common/all-versions/default/service/service.cpp @@ -18,8 +18,10 @@ #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/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/bluetooth/a2dp/1.0/IBluetoothAudioOffload.h> #include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h> #include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h> @@ -64,13 +66,15 @@ int main(int /* argc */, char* /* argv */ []) { } configureRpcThreadpool(16, true /*callerWillJoin*/); - bool fail = registerPassthroughServiceImplementation<audio::V4_0::IDevicesFactory>() != OK && + bool fail = registerPassthroughServiceImplementation<audio::V5_0::IDevicesFactory>() != OK && + registerPassthroughServiceImplementation<audio::V4_0::IDevicesFactory>() != OK && registerPassthroughServiceImplementation<audio::V2_0::IDevicesFactory>() != OK; - LOG_ALWAYS_FATAL_IF(fail, "Could not register audio core API 2.0 nor 4.0"); + LOG_ALWAYS_FATAL_IF(fail, "Could not register audio core API 2, 4 nor 5"); - fail = registerPassthroughServiceImplementation<audio::effect::V4_0::IEffectsFactory>() != OK && + fail = registerPassthroughServiceImplementation<audio::effect::V5_0::IEffectsFactory>() != OK && + registerPassthroughServiceImplementation<audio::effect::V4_0::IEffectsFactory>() != OK && registerPassthroughServiceImplementation<audio::effect::V2_0::IEffectsFactory>() != OK, - LOG_ALWAYS_FATAL_IF(fail, "Could not register audio effect API 2.0 nor 4.0"); + LOG_ALWAYS_FATAL_IF(fail, "Could not register audio effect API 2, 4 nor 5"); fail = registerPassthroughServiceImplementation<soundtrigger::V2_1::ISoundTriggerHw>() != OK && registerPassthroughServiceImplementation<soundtrigger::V2_0::ISoundTriggerHw>() != OK, |