Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3899315c authored by Cheney Ni's avatar Cheney Ni Committed by android-build-merger
Browse files

Merge "Register Bluetooth Audio Hal v2 within Audio HAL" am: f7b6c737 am: 6cef9b0a 

am: 1c9ef33a

Change-Id: I1868f8093259855c2331231678dc71f3f2522735
parents 36e11ac4 1c9ef33a

audio/common/all-versions/default/service/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

audio/common/all-versions/default/service/service.cpp

+6 −0
Original line number Diff line number Diff line
@@ -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;