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

Commit 63310b10 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Fix race condition in AudioRecordThread::wake" into mnc-dev

parents 31df62ab 805a0c70

media/libmedia/AudioRecord.cpp

+8 −4
Original line number Diff line number Diff line
@@ -1235,13 +1235,17 @@ void AudioRecord::AudioRecordThread::resume() 
void AudioRecord::AudioRecordThread::wake()

{

    AutoMutex _l(mMyLock);

    if (!mPaused && mPausedInt && mPausedNs > 0) {

        // audio record is active and internally paused with timeout.

    if (!mPaused) {

        // wake() might be called while servicing a callback - ignore the next

        // pause time and call processAudioBuffer.

        mIgnoreNextPausedInt = true;

        if (mPausedInt && mPausedNs > 0) {

            // audio record is active and internally paused with timeout.

            mPausedInt = false;

            mMyCond.signal();

        }

    }

}



void AudioRecord::AudioRecordThread::pauseInternal(nsecs_t ns)

{