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 | aa47eb2e0560ade9e0d899e72d733bb6764973b6 (patch) | |
tree | 6279ecc72189f855a6e247402e668af1b6c0a59f /media/libmediaplayerservice/MediaPlayerService.cpp | |
parent | 6db76e8b8f561355198fc91dd95498a59ad38a20 (diff) | |
parent | dcfefde6be8f9f33bbd2b3546f3be946d958d677 (diff) | |
download | frameworks_av-aa47eb2e0560ade9e0d899e72d733bb6764973b6.zip frameworks_av-aa47eb2e0560ade9e0d899e72d733bb6764973b6.tar.gz frameworks_av-aa47eb2e0560ade9e0d899e72d733bb6764973b6.tar.bz2 |
Merge "fix a race condition of MediaPlayerServce::Client::mClient"
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-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 9bedff1..25aa611 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(); |