diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-10-16 18:12:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 18:12:55 -0700 |
| commit | abe0948c7b9aa32dceb82cebbfca52beb782754b (patch) | |
| tree | a9018d0695d2a0221b8ce5e2dca84eb6bdec92e1 /include/media | |
| parent | 85b56a702f155cda9b945bcbadaa89e0f9ecc4a8 (diff) | |
| parent | b2059ff384eee8ffb70a7ec8fc5570405201c734 (diff) | |
| download | frameworks_av-abe0948c7b9aa32dceb82cebbfca52beb782754b.zip frameworks_av-abe0948c7b9aa32dceb82cebbfca52beb782754b.tar.gz frameworks_av-abe0948c7b9aa32dceb82cebbfca52beb782754b.tar.bz2 | |
am b2059ff3: am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
* commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734':
Fix race condition in AudioTrack::pause followed by start
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioTrack.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index f863e35..e5cf896 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -612,6 +612,7 @@ protected: 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 AudioTrackThread::threadLoop() |