diff options
author | Glenn Kasten <gkasten@google.com> | 2014-01-13 09:59:51 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2014-01-13 13:58:58 -0800 |
commit | 41721bb796da589f8a669d1db7687a0da8f88761 (patch) | |
tree | 1b96e9960396c6a8aed03afe63911c721e30a132 /media | |
parent | aaa42e57797db140ead1068dce6340ffd33fa005 (diff) | |
download | frameworks_av-41721bb796da589f8a669d1db7687a0da8f88761.zip frameworks_av-41721bb796da589f8a669d1db7687a0da8f88761.tar.gz frameworks_av-41721bb796da589f8a669d1db7687a0da8f88761.tar.bz2 |
Fix race condition in AudioRecord::pause followed by start
Bug: 11148722
Change-Id: Ia1e14133d73ac301fe06a047e70a573911822630
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/AudioRecord.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 6ec8ed2..4328593 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -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; |