diff options
author | Glenn Kasten <gkasten@google.com> | 2013-10-16 17:02:13 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2013-10-16 17:20:11 -0700 |
commit | 598de6c701e989385eeffa7c5dfd61f0459a2631 (patch) | |
tree | 090b30e255f0aed57a73ca6c9252e19da162fd97 /media/libmedia | |
parent | 014e7fa2e90827d911c37bb0ce4d2e10e14d0bb3 (diff) | |
download | frameworks_av-598de6c701e989385eeffa7c5dfd61f0459a2631.zip frameworks_av-598de6c701e989385eeffa7c5dfd61f0459a2631.tar.gz frameworks_av-598de6c701e989385eeffa7c5dfd61f0459a2631.tar.bz2 |
Fix race condition in AudioTrack::pause followed by start
Bug: 11148722
Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
Diffstat (limited to 'media/libmedia')
-rw-r--r-- | media/libmedia/AudioTrack.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 37d50cf..80f5155 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1785,7 +1785,8 @@ void AudioTrack::DeathNotifier::binderDied(const wp<IBinder>& who) // ========================================================================= AudioTrack::AudioTrackThread::AudioTrackThread(AudioTrack& 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) { } @@ -1802,6 +1803,10 @@ bool AudioTrack::AudioTrackThread::threadLoop() // caller will check for exitPending() return true; } + if (mIgnoreNextPausedInt) { + mIgnoreNextPausedInt = false; + mPausedInt = false; + } if (mPausedInt) { if (mPausedNs > 0) { (void) mMyCond.waitRelative(mMyLock, mPausedNs); @@ -1836,12 +1841,7 @@ void AudioTrack::AudioTrackThread::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 AudioTrack::AudioTrackThread::pause() @@ -1853,6 +1853,7 @@ void AudioTrack::AudioTrackThread::pause() void AudioTrack::AudioTrackThread::resume() { AutoMutex _l(mMyLock); + mIgnoreNextPausedInt = true; if (mPaused || mPausedInt) { mPaused = false; mPausedInt = false; |