commit 6bc71cac3619b0a5bb70d87abded691f3f929e3b
author Andreas Huber <andih@google.com> Wed Apr 24 09:52:49 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 24 09:52:49 2013 -0700
tree c4668ec4594fc9a651d95d692a7a2956bf8f4fcb
parent 3ba2aea1588438d0768ed48fc2749a2034eb3a2b
parent aa47eb2e0560ade9e0d899e72d733bb6764973b6

am 628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"

* commit '628a8c0ed91531468f5c615fea8745f63cc812aa':
  fix a race condition of MediaPlayerServce::Client::mClient

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index ec6ace1..8473c47 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -529,8 +529,8 @@
     {
         Mutex::Autolock l(mLock);
         p = mPlayer;
+        mClient.clear();
     }
-    mClient.clear();
 
     mPlayer.clear();