diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-31 08:55:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-31 08:55:51 -0700 |
| commit | 1b0efec3473134fb7de226f3e1fdade5b3529ad9 (patch) | |
| tree | 8f3c4a9988820183ee63aa85dcb2e7c0608eb7f7 /media/jni/soundpool/SoundPool.h | |
| parent | 010582885cbd5e1becadd6c53816c399465b459d (diff) | |
| parent | 17c195c8da3470b2e69880e206342f0c2d85f938 (diff) | |
| download | frameworks_base-1b0efec3473134fb7de226f3e1fdade5b3529ad9.zip frameworks_base-1b0efec3473134fb7de226f3e1fdade5b3529ad9.tar.gz frameworks_base-1b0efec3473134fb7de226f3e1fdade5b3529ad9.tar.bz2 | |
am 17c195c8: Merge change 9340 into donut
Merge commit '17c195c8da3470b2e69880e206342f0c2d85f938'
* commit '17c195c8da3470b2e69880e206342f0c2d85f938':
Fix issue 2025872: Deadlock in SoundPool.stop
Diffstat (limited to 'media/jni/soundpool/SoundPool.h')
| -rw-r--r-- | media/jni/soundpool/SoundPool.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/jni/soundpool/SoundPool.h b/media/jni/soundpool/SoundPool.h index 7802781..ab86e90 100644 --- a/media/jni/soundpool/SoundPool.h +++ b/media/jni/soundpool/SoundPool.h @@ -204,6 +204,7 @@ private: jobject mSoundPoolRef; Mutex mLock; + Mutex mRestartLock; Condition mCondition; SoundPoolThread* mDecodeThread; SoundChannel* mChannelPool; |