diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-10-17 00:59:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-17 00:59:33 +0000 |
| commit | f8f15b05fe051009945c9042a1a9260280e0feb2 (patch) | |
| tree | 28fd5dede6b2aae34a9b3b987049f3331ace5037 /include | |
| parent | 787c0d04ac4f9c938a1311f8e30d9d7ac2b8a6da (diff) | |
| parent | 598de6c701e989385eeffa7c5dfd61f0459a2631 (diff) | |
| download | frameworks_av-f8f15b05fe051009945c9042a1a9260280e0feb2.zip frameworks_av-f8f15b05fe051009945c9042a1a9260280e0feb2.tar.gz frameworks_av-f8f15b05fe051009945c9042a1a9260280e0feb2.tar.bz2 | |
Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
Diffstat (limited to 'include')
| -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 22ad57e..f2f9c22 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() |