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

Commit 96883a54 authored by Eric Laurent's avatar Eric Laurent Committed by Gerrit Code Review
Browse files

SoundTrigger: get service by value. 

Get strong pointer to service interface by value and not reference to
prevent race conditions where the service pointer can be cleared
by another thread while in use.

CYNGNOS-3303
Bug: 30907212
Change-Id: I6f02ec3fd1e6392b842b334e1cc4f9aa23916009
(cherry picked from commit 3b01b301)
(cherry picked from commit a41095d4)
(cherry picked from commit f2185115)
parent c5d44bab

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;

    }