Fix race condition in AudioRecord::pause followed by start (41721bb7) · Commits · e / os / android_frameworks_av

include/media/AudioRecord.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -412,6 +412,7 @@ private:
		bool mPaused; // whether thread is requested to pause at next loop entry
		bool mPausedInt; // whether thread internally requests pause
		nsecs_t mPausedNs; // if mPausedInt then associated timeout, otherwise ignored
		bool mIgnoreNextPausedInt; // whether to ignore next mPausedInt request
		};

		// body of AudioRecordThread::threadLoop()

+8 −7

Original line number	Diff line number	Diff line
		@@ -966,7 +966,8 @@ void AudioRecord::DeathNotifier::binderDied(const wp<IBinder>& who __unused)
		// =========================================================================

		AudioRecord::AudioRecordThread::AudioRecordThread(AudioRecord& receiver, bool bCanCallJava)
		: Thread(bCanCallJava), mReceiver(receiver), mPaused(true), mPausedInt(false), mPausedNs(0LL)
		: Thread(bCanCallJava), mReceiver(receiver), mPaused(true), mPausedInt(false), mPausedNs(0LL),
		mIgnoreNextPausedInt(false)
		{
		}

		@@ -983,6 +984,10 @@ bool AudioRecord::AudioRecordThread::threadLoop()
		// caller will check for exitPending()
		return true;
		}
		if (mIgnoreNextPausedInt) {
		mIgnoreNextPausedInt = false;
		mPausedInt = false;
		}
		if (mPausedInt) {
		if (mPausedNs > 0) {
		(void) mMyCond.waitRelative(mMyLock, mPausedNs);
		@@ -1017,12 +1022,7 @@ void AudioRecord::AudioRecordThread::requestExit()
		{
		// must be in this order to avoid a race condition
		Thread::requestExit();
		AutoMutex _l(mMyLock);
		if (mPaused \|\| mPausedInt) {
		mPaused = false;
		mPausedInt = false;
		mMyCond.signal();
		}
		resume();
		}

		void AudioRecord::AudioRecordThread::pause()
		@@ -1034,6 +1034,7 @@ void AudioRecord::AudioRecordThread::pause()
		void AudioRecord::AudioRecordThread::resume()
		{
		AutoMutex _l(mMyLock);
		mIgnoreNextPausedInt = true;
		if (mPaused \|\| mPausedInt) {
		mPaused = false;
		mPausedInt = false;