diff options
| author | Andreas Huber <andih@google.com> | 2013-04-24 15:46:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-24 15:46:13 +0000 |
| commit | 628a8c0ed91531468f5c615fea8745f63cc812aa (patch) | |
| tree | dd257b4ed76b838ece43422ff06c2a1b3877259b | |
| parent | 3030f344e77d14cf688c34f79c83a045c888825d (diff) | |
| parent | dcfefde6be8f9f33bbd2b3546f3be946d958d677 (diff) | |
Merge "fix a race condition of MediaPlayerServce::Client::mClient"
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 9bedff13..25aa6117 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -521,8 +521,8 @@ void MediaPlayerService::Client::disconnect() { Mutex::Autolock l(mLock); p = mPlayer; + mClient.clear(); } - mClient.clear(); mPlayer.clear(); |