| commit | 628a8c0ed91531468f5c615fea8745f63cc812aa | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Apr 24 15:46:11 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 24 15:46:13 2013 +0000 |
| tree | dd257b4ed76b838ece43422ff06c2a1b3877259b | |
| parent | 3030f344e77d14cf688c34f79c83a045c888825d [diff] | |
| parent | dcfefde6be8f9f33bbd2b3546f3be946d958d677 [diff] |
Merge "fix a race condition of MediaPlayerServce::Client::mClient"
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 9bedff1..25aa611 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -521,8 +521,8 @@ { Mutex::Autolock l(mLock); p = mPlayer; + mClient.clear(); } - mClient.clear(); mPlayer.clear();