diff options
| author | Cheney Ni <cheneyni@google.com> | 2019-02-06 19:06:45 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-06 19:06:45 -0800 |
| commit | 1c9ef33a173f344c9e931e28d67511bb238fba25 (patch) | |
| tree | 4c4c8d3d306ac4ddf4d7967834b705e3895df45f | |
| parent | 0525e64e7a1d4cdad988b0bb2514183755e8059f (diff) | |
| parent | 6cef9b0a49e8e1fdd933f58f50a73024e755913e (diff) | |
Merge "Register Bluetooth Audio Hal v2 within Audio HAL" am: f7b6c73725
am: 6cef9b0a49
Change-Id: I7b882b1a28d67be5d6393ef34947cce888014304
| -rw-r--r-- | audio/common/all-versions/default/service/Android.mk | 1 | ||||
| -rw-r--r-- | audio/common/all-versions/default/service/service.cpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/audio/common/all-versions/default/service/Android.mk b/audio/common/all-versions/default/service/Android.mk index 43d7fe19c5..5ef440f171 100644 --- a/audio/common/all-versions/default/service/Android.mk +++ b/audio/common/all-versions/default/service/Android.mk @@ -44,6 +44,7 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.audio.effect@2.0 \ android.hardware.audio.effect@4.0 \ android.hardware.bluetooth.a2dp@1.0 \ + android.hardware.bluetooth.audio@2.0 \ android.hardware.soundtrigger@2.0 \ android.hardware.soundtrigger@2.1 diff --git a/audio/common/all-versions/default/service/service.cpp b/audio/common/all-versions/default/service/service.cpp index c7ce638e7f..c45f885650 100644 --- a/audio/common/all-versions/default/service/service.cpp +++ b/audio/common/all-versions/default/service/service.cpp @@ -21,6 +21,7 @@ #include <android/hardware/audio/effect/2.0/IEffectsFactory.h> #include <android/hardware/audio/effect/4.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> #include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h> #include <binder/ProcessState.h> @@ -48,6 +49,11 @@ int main(int /* argc */, char* /* argv */ []) { registerPassthroughServiceImplementation<soundtrigger::V2_0::ISoundTriggerHw>() != OK, ALOGW_IF(fail, "Could not register soundtrigger API 2.0 nor 2.1"); + fail = registerPassthroughServiceImplementation< + bluetooth::audio::V2_0::IBluetoothAudioProvidersFactory>() != OK; + ALOGW_IF(fail, "Could not register Bluetooth Audio API 2.0"); + + // remove the old HIDL when Bluetooth Audio Hal V2 has offloading supported fail = registerPassthroughServiceImplementation<bluetooth::a2dp::V1_0::IBluetoothAudioOffload>() != OK; |