diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-11-09 07:17:38 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-09 07:17:38 -0800 |
| commit | b921740510e15a4e403e2819f1a8f0a9a6c03da9 (patch) | |
| tree | 1e75126cc005b17aa83848fd00f6f253556096b8 | |
| parent | e8c04ee9ea63b90667aaf5be6fbb3475ecd93520 (diff) | |
| parent | 93a7499626601967b4b46ac7bc00c0c90719ad36 (diff) | |
| download | android_system_media-b921740510e15a4e403e2819f1a8f0a9a6c03da9.tar.gz android_system_media-b921740510e15a4e403e2819f1a8f0a9a6c03da9.tar.bz2 android_system_media-b921740510e15a4e403e2819f1a8f0a9a6c03da9.zip | |
Merge "Bug 5578928 Fix race in stop for destroy" into ics-mr1
| -rw-r--r-- | wilhelm/src/android/android_StreamPlayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wilhelm/src/android/android_StreamPlayer.cpp b/wilhelm/src/android/android_StreamPlayer.cpp index 2c2e0c63..6e14897b 100644 --- a/wilhelm/src/android/android_StreamPlayer.cpp +++ b/wilhelm/src/android/android_StreamPlayer.cpp @@ -342,7 +342,10 @@ void StreamPlayer::onStopForDestroy() { mPreparedPlayer.clear(); } } - mStopForDestroyCompleted = true; + { + Mutex::Autolock _l(mStopForDestroyLock); + mStopForDestroyCompleted = true; + } mStopForDestroyCondition.signal(); } |