commit 8dca22b0d016cf81681341d76bc44bb3b76d58a8
author Andreas Huber <andih@google.com> Wed Apr 24 10:45:12 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 24 10:45:12 2013 -0700
tree 7c645da883c17c20e4afc129a2f77c1b662999ad
parent cdabfe48c300f15466c9472375d7ad2ccf9ba328
parent 2c2345cf7e163f532f32597051f579cdb0e36bec

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

* commit '2c2345cf7e163f532f32597051f579cdb0e36bec':
  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();