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

Commit d9288b85 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "SoundTrigger: get service by value." into lmp-dev

parents 563b1009 3b01b301

include/soundtrigger/SoundTrigger.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public: 
private:

            SoundTrigger(sound_trigger_module_handle_t module,

                            const sp<SoundTriggerCallback>&);

            static const sp<ISoundTriggerHwService>& getSoundTriggerHwService();

            static const sp<ISoundTriggerHwService> getSoundTriggerHwService();



            Mutex                               mLock;

            sp<ISoundTrigger>                   mISoundTrigger;

soundtrigger/SoundTrigger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ namespace { 
    sp<DeathNotifier>         gDeathNotifier;

}; // namespace anonymous



const sp<ISoundTriggerHwService>& SoundTrigger::getSoundTriggerHwService()

const sp<ISoundTriggerHwService> SoundTrigger::getSoundTriggerHwService()

{

    Mutex::Autolock _l(gLock);

    if (gSoundTriggerHwService.get() == 0) {
@@ -84,7 +84,7 @@ status_t SoundTrigger::listModules(struct sound_trigger_module_descriptor *modul 
                                 uint32_t *numModules)

{

    ALOGV("listModules()");

    const sp<ISoundTriggerHwService>& service = getSoundTriggerHwService();

    const sp<ISoundTriggerHwService> service = getSoundTriggerHwService();

    if (service == 0) {

        return NO_INIT;

    }
@@ -96,7 +96,7 @@ sp<SoundTrigger> SoundTrigger::attach(const sound_trigger_module_handle_t module 
{

    ALOGV("attach()");

    sp<SoundTrigger> soundTrigger;

    const sp<ISoundTriggerHwService>& service = getSoundTriggerHwService();

    const sp<ISoundTriggerHwService> service = getSoundTriggerHwService();

    if (service == 0) {

        return soundTrigger;

    }
@@ -116,7 +116,7 @@ sp<SoundTrigger> SoundTrigger::attach(const sound_trigger_module_handle_t module 
status_t SoundTrigger::setCaptureState(bool active)

{

    ALOGV("setCaptureState(%d)", active);

    const sp<ISoundTriggerHwService>& service = getSoundTriggerHwService();

    const sp<ISoundTriggerHwService> service = getSoundTriggerHwService();

    if (service == 0) {

        return NO_INIT;

    }