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

Commit 8d7146c7 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

soundtrigger: Use "default" instance name for HAL service am: 49ad5522 

am: 32f0f832

Change-Id: I087c86707ef59e0490ffd84dacfc0dfe29d6fb4e
parents 7b498777 32f0f832

services/soundtrigger/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)



ifeq ($(SOUND_TRIGGER_USE_STUB_MODULE), 1)

    ifneq ($(USE_LEGACY_LOCAL_AUDIO_HAL), true)

        $(error Requires building with USE_LEGACY_LOCAL_AUDIO_HAL=true)

    endif

    LOCAL_CFLAGS += -DSOUND_TRIGGER_USE_STUB_MODULE

endif

services/soundtrigger/SoundTriggerHalHidl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -252,6 +252,8 @@ int SoundTriggerHalHidl::stopAllRecognitions() 
SoundTriggerHalHidl::SoundTriggerHalHidl(const char *moduleName)

    : mModuleName(moduleName), mNextUniqueId(1)

{

    LOG_ALWAYS_FATAL_IF(strcmp(mModuleName, "primary") != 0,

            "Treble soundtrigger only supports primary module");

}



SoundTriggerHalHidl::~SoundTriggerHalHidl()
@@ -265,9 +267,7 @@ sp<ISoundTriggerHw> SoundTriggerHalHidl::getService() 
        if (mModuleName == NULL) {

            mModuleName = "primary";

        }

        std::string serviceName = "sound_trigger.";

        serviceName.append(mModuleName);

        mISoundTrigger = ISoundTriggerHw::getService(serviceName);

        mISoundTrigger = ISoundTriggerHw::getService();

        if (mISoundTrigger != 0) {

            mISoundTrigger->linkToDeath(HalDeathHandler::getInstance(), 0 /*cookie*/);

        }