diff options
| author | Cheney Ni <cheneyni@google.com> | 2019-02-06 19:14:51 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-06 19:14:51 -0800 |
| commit | 3899315c00348cb2affa19c3952a194399a22703 (patch) | |
| tree | 8d934d78f7c007cca9b812c8827ce41cd175362b /audio | |
| parent | 36e11ac4c7b04680f3f279ce757e361033fc301e (diff) | |
| parent | 1c9ef33a173f344c9e931e28d67511bb238fba25 (diff) | |
| download | android_hardware_interfaces-3899315c00348cb2affa19c3952a194399a22703.tar.gz android_hardware_interfaces-3899315c00348cb2affa19c3952a194399a22703.tar.bz2 android_hardware_interfaces-3899315c00348cb2affa19c3952a194399a22703.zip | |
Merge "Register Bluetooth Audio Hal v2 within Audio HAL" am: f7b6c73725 am: 6cef9b0a49
am: 1c9ef33a17
Change-Id: I1868f8093259855c2331231678dc71f3f2522735
Diffstat (limited to 'audio')
| -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 58987c781..b57a1ae3d 100644 --- a/audio/common/all-versions/default/service/Android.mk +++ b/audio/common/all-versions/default/service/Android.mk @@ -49,6 +49,7 @@ LOCAL_SHARED_LIBRARIES := \ android.hardware.audio.effect@4.0 \ android.hardware.audio.effect@5.0 \ android.hardware.bluetooth.a2dp@1.0 \ + android.hardware.bluetooth.audio@2.0 \ android.hardware.soundtrigger@2.0 \ android.hardware.soundtrigger@2.1 \ android.hardware.soundtrigger@2.2 diff --git a/audio/common/all-versions/default/service/service.cpp b/audio/common/all-versions/default/service/service.cpp index 15ce5e0bc..8a7b2ea09 100644 --- a/audio/common/all-versions/default/service/service.cpp +++ b/audio/common/all-versions/default/service/service.cpp @@ -23,6 +23,7 @@ #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/bluetooth/audio/2.0/IBluetoothAudioProvidersFactory.h> #include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h> #include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h> #include <android/hardware/soundtrigger/2.2/ISoundTriggerHw.h> @@ -64,6 +65,11 @@ int main(int /* argc */, char* /* argv */ []) { registerPassthroughServiceImplementation<soundtrigger::V2_0::ISoundTriggerHw>() != OK, ALOGW_IF(fail, "Could not register soundtrigger API 2.0, 2.1 nor 2.2"); + 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; |