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

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

Merge "soundtrigger: Fall back to V2.0 if V2.1 is not present"

parents 73ed9171 ce8d65b5

audio/2.0/default/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.audio@2.0 \

    android.hardware.audio.common@2.0 \

    android.hardware.audio.effect@2.0 \

    android.hardware.soundtrigger@2.1 \

    android.hardware.broadcastradio@1.0 \

    android.hardware.broadcastradio@1.1

    android.hardware.soundtrigger@2.0 \

    android.hardware.soundtrigger@2.1



# Can not switch to Android.bp until AUDIOSERVER_MULTILIB

# is deprecated as build config variable are not supported

audio/2.0/default/service.cpp

+7 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#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>
@@ -28,7 +29,8 @@ using android::hardware::registerPassthroughServiceImplementation; 


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

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

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

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

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

using android::hardware::registerPassthroughServiceImplementation;



using android::OK;
@@ -41,8 +43,10 @@ int main(int /* argc */, char* /* argv */ []) { 
    status = registerPassthroughServiceImplementation<IEffectsFactory>();

    LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering audio effects service: %d", status);

    // Soundtrigger might be not present.

    status = registerPassthroughServiceImplementation<ISoundTriggerHw>();

    ALOGE_IF(status != OK, "Error while registering soundtrigger service: %d", status);

    status = registerPassthroughServiceImplementation<V2_1_ISoundTriggerHw>();

    ALOGW_IF(status != OK, "Registering soundtrigger V2.1 service was unsuccessful: %d", status);

    status = registerPassthroughServiceImplementation<V2_0_ISoundTriggerHw>();

    ALOGW_IF(status != OK, "Registering soundtrigger V2.0 service was unsuccessful: %d", status);

    joinRpcThreadpool();

    return status;

}