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

Commit 3f8211d4 authored by Petri Gynther's avatar Petri Gynther Committed by Android (Google) Code Review
Browse files

Merge "audio: Register Bluetooth service with audio HAL" into pi-dev

parents 1a016fec d93a3ada

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.audio.common@4.0 \

    android.hardware.audio.common@4.0 \

    android.hardware.audio.effect@2.0 \

    android.hardware.audio.effect@2.0 \

    android.hardware.audio.effect@4.0 \

    android.hardware.audio.effect@4.0 \

    android.hardware.bluetooth.a2dp@1.0 \

    android.hardware.soundtrigger@2.0 \

    android.hardware.soundtrigger@2.0 \

    android.hardware.soundtrigger@2.1

    android.hardware.soundtrigger@2.1

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <android/hardware/audio/4.0/IDevicesFactory.h>

#include <android/hardware/audio/4.0/IDevicesFactory.h>

#include <android/hardware/audio/effect/2.0/IEffectsFactory.h>

#include <android/hardware/audio/effect/2.0/IEffectsFactory.h>

#include <android/hardware/audio/effect/4.0/IEffectsFactory.h>

#include <android/hardware/audio/effect/4.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.0/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.1/ISoundTriggerHw.h>

#include <binder/ProcessState.h>

#include <binder/ProcessState.h>
@@ -47,5 +48,10 @@ int main(int /* argc */, char* /* argv */ []) { 
           registerPassthroughServiceImplementation<soundtrigger::V2_0::ISoundTriggerHw>() != OK,

           registerPassthroughServiceImplementation<soundtrigger::V2_0::ISoundTriggerHw>() != OK,

    ALOGW_IF(fail, "Could not register soundtrigger API 2.0 nor 2.1");

    ALOGW_IF(fail, "Could not register soundtrigger API 2.0 nor 2.1");





    fail =

        registerPassthroughServiceImplementation<bluetooth::a2dp::V1_0::IBluetoothAudioOffload>() !=

        OK;

    ALOGW_IF(fail, "Could not register Bluetooth audio offload 1.0");



    joinRpcThreadpool();

    joinRpcThreadpool();

}
 
}