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

Commit 542e88e9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move AudioSystem errorCallback call out from gLock" into rvc-dev am: 0428fecb 

Change-Id: I747fa4ab6512c9e6b64ba1246cd657742a09ae1d
parents 7f253664 0428fecb

media/libaudioclient/AudioSystem.cpp

+3 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ const sp<IAudioFlinger> AudioSystem::get_audio_flinger() 
{

    sp<IAudioFlinger> af;

    sp<AudioFlingerClient> afc;

    bool reportNoError = false;

    {

        Mutex::Autolock _l(gLock);

        if (gAudioFlinger == 0) {
@@ -70,7 +71,7 @@ const sp<IAudioFlinger> AudioSystem::get_audio_flinger() 
            if (gAudioFlingerClient == NULL) {

                gAudioFlingerClient = new AudioFlingerClient();

            } else {

                reportError(NO_ERROR);

                reportNoError = true;

            }

            binder->linkToDeath(gAudioFlingerClient);

            gAudioFlinger = interface_cast<IAudioFlinger>(binder);
@@ -86,6 +87,7 @@ const sp<IAudioFlinger> AudioSystem::get_audio_flinger() 
        af->registerClient(afc);

        IPCThreadState::self()->restoreCallingIdentity(token);

    }

    if (reportNoError) reportError(NO_ERROR);

    return af;

}