commit a7549d3dce0b313c8d22d54e43217d822393e5ae
author Wei Jia <wjia@google.com> Wed Aug 31 00:10:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 31 00:10:56 2016 +0000
tree 759113fc77f9124a29d48987f4620676a91dd136
parent a9c1e43d89d7afc587b620cf7c01d94c1722ad2f
parent de97dbd662bc959bfe4a894c8678f1383294e148

MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a am: 0dd714e408
am: de97dbd662

Change-Id: I758cf33ec36858a612efe6c412af3df9653f9229

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index ef28c12..a39bb65 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1014,7 +1014,7 @@
     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;
     }