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

Commit 36a8e2bc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "soundtrigger: Switch audio service to load soundtrigger 2.1"

parents dec9b448 5697a9b2

audio/2.0/default/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.audio@2.0 \

    android.hardware.audio.common@2.0 \

    android.hardware.audio.effect@2.0 \

    android.hardware.soundtrigger@2.0 \

    android.hardware.soundtrigger@2.1 \

    android.hardware.broadcastradio@1.0 \

    android.hardware.broadcastradio@1.1

audio/2.0/default/service.cpp

+4 −4
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


#define LOG_TAG "audiohalservice"



#include <hidl/HidlTransportSupport.h>

#include <hidl/LegacySupport.h>

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

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

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

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

#include <hidl/HidlTransportSupport.h>

#include <hidl/LegacySupport.h>



using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;
@@ -28,7 +28,7 @@ using android::hardware::registerPassthroughServiceImplementation; 


using android::hardware::audio::effect::V2_0::IEffectsFactory;

using android::hardware::audio::V2_0::IDevicesFactory;

using android::hardware::soundtrigger::V2_0::ISoundTriggerHw;

using android::hardware::soundtrigger::V2_1::ISoundTriggerHw;

using android::hardware::registerPassthroughServiceImplementation;



using android::OK;