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

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

Merge changes I6923e891,Id5c62c31 

* changes:
  audioflinger: effect: fix deadlock after dumpsys
  audioeffect: fix segfault on device effect configuration
parents 9c1d9c15 fcf15bf4

services/audioflinger/Effects.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1006,8 +1006,9 @@ status_t EffectModule::configure() 
    // mConfig.outputCfg.buffer.frameCount cannot be zero.

    mMaxDisableWaitCnt = (uint32_t)std::max(

            (uint64_t)1, // mMaxDisableWaitCnt must be greater than zero.

            (uint64_t)MAX_DISABLE_TIME_MS * mConfig.outputCfg.samplingRate

                / ((uint64_t)1000 * mConfig.outputCfg.buffer.frameCount));

            (uint64_t)mConfig.outputCfg.buffer.frameCount == 0 ? 1

                : (MAX_DISABLE_TIME_MS * mConfig.outputCfg.samplingRate

                / ((uint64_t)1000 * mConfig.outputCfg.buffer.frameCount)));



exit:

    // TODO: consider clearing mConfig on error.
@@ -3520,7 +3521,7 @@ NO_THREAD_SAFETY_ANALYSIS // conditional try lock 
    }



    if (locked) {

        mLock.unlock();

        mProxyLock.unlock();

    }

}