commit 16433e2fe309f759fec3266db56232f55114beb2
author Dave Sparks <davidsparks@android.com> Mon Mar 01 19:29:58 2010 -0800
committer Dave Sparks <davidsparks@android.com> Tue Mar 02 12:35:20 2010 -0800
tree 2ad865677ad3d7d3efd0c4d67b6e206172a7bf45
parent 14b60e747cdf16b79bb755b42dd766348c4f1880

Add locking to signal in AudioCache::notify(). Bug 2317844.

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index c26d682..6332f70 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1768,7 +1768,7 @@
 status_t MediaPlayerService::AudioCache::wait()
 {
     Mutex::Autolock lock(mLock);
-    if (!mCommandComplete) {
+    while (!mCommandComplete) {
         mSignal.wait(mLock);
     }
     mCommandComplete = false;
@@ -1805,6 +1805,7 @@
     }
 
     // wake up thread
+    Mutex::Autolock lock(mLock);
     p->mCommandComplete = true;
     p->mSignal.signal();
 }