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

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

Merge "audio:fix deadlock"

parents cd4e26d3 46407563

services/audioflinger/Effects.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -278,8 +278,8 @@ status_t AudioFlinger::EffectBase::updatePolicyState() 
        if (!doRegister && !(registered && doEnable)) {

        if (!doRegister && !(registered && doEnable)) {

            return NO_ERROR;

            return NO_ERROR;

        }

        }

        mPolicyLock.lock();

    }

    }

    mPolicyLock.lock();

    ALOGV("%s name %s id %d session %d doRegister %d registered %d doEnable %d enabled %d",

    ALOGV("%s name %s id %d session %d doRegister %d registered %d doEnable %d enabled %d",

        __func__, mDescriptor.name, mId, mSessionId, doRegister, registered, doEnable, enabled);

        __func__, mDescriptor.name, mId, mSessionId, doRegister, registered, doEnable, enabled);

    if (doRegister) {

    if (doRegister) {