Commit 8dca22b0 authored Apr 24, 2013 by Andreas Huber Committed by Android Git Automerger Apr 24, 2013

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

* commit '2c2345cf':
  fix a race condition of MediaPlayerServce::Client::mClient

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -529,8 +529,8 @@ void MediaPlayerService::Client::disconnect()
		{
		Mutex::Autolock l(mLock);
		p = mPlayer;
		}
		mClient.clear();
		}

		mPlayer.clear();