Commit 21b83d1c authored Aug 31, 2016 by Wei Jia Committed by android-build-merger Aug 31, 2016

MediaPlayerService: allow next player to be NULL am: 28284127 am: f4e00a7c...

MediaPlayerService: allow next player to be NULL am: 28284127 am: f4e00a7c am: 0dd714e4 am: de97dbd6 am: a7549d3d am: c6fdb3d6 am: 629e78c1 am: 50b9d889 am: 81e05575 am: 31407677 am: 4d03d0d1 am: 22fdb932
am: 884b1861

Change-Id: I71cbae61748477abf88449bc49b5559f69fcc621

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1092,7 +1092,7 @@ status_t MediaPlayerService::Client::setNextPlayer(const sp<IMediaPlayer>& playe
		ALOGV("setNextPlayer");
		Mutex::Autolock l(mLock);
		sp<Client> c = static_cast<Client*>(player.get());
		if (!mService->hasClient(c)) {
		if (c != NULL && !mService->hasClient(c)) {
		return BAD_VALUE;
		}