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

Commit 33e6e35b authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Miscellaneous audio record fixes 

Call AudioSystem::stopInput() if exitPending() after wait() returns.

Acquire lock before clearing mActiveThread.

Change-Id: Ia55e4c4b3accc65ad5479cbdc094fd919152af9f
parent cd2d6101

services/audioflinger/AudioFlinger.cpp

+6 −3
Original line number Diff line number Diff line
@@ -6120,9 +6120,12 @@ bool AudioFlinger::RecordThread::threadLoop() 
    if (!mStandby) {

        mInput->stream->common.standby(&mInput->stream->common);

    }

    mActiveTrack.clear();



    {

        Mutex::Autolock _l(mLock);

        mActiveTrack.clear();

        mStartStopCond.broadcast();

    }



    releaseWakeLock();
@@ -6298,7 +6301,7 @@ void AudioFlinger::RecordThread::stop(RecordThread::RecordTrack* recordTrack) { 
            }

            mStartStopCond.wait(mLock);

            // if we have been restarted, recordTrack == mActiveTrack.get() here

            if (mActiveTrack == 0 || recordTrack != mActiveTrack.get()) {

            if (exitPending() || mActiveTrack == 0 || recordTrack != mActiveTrack.get()) {

                mLock.unlock();

                AudioSystem::stopInput(mId);

                mLock.lock();