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

Commit a82be3e7 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: Ie31acca954d71c4d95aa8143168a3b7e03e0aaa2
parents 99c2c391 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;

}