commit 3f1c6d1e5555a86c1277db1c241814d9486dfce2
author Wei Jia <wjia@google.com> Tue Aug 30 13:49:06 2016 -0700
committer gitbuildkicker <android-build@google.com> Wed Aug 31 22:20:28 2016 -0700
tree 07cf81b2f739c887e5ea3bbd9d0fb93d5dc88fa6
parent 6b9e49454f514f8d4e68c0aa91dc426320c3c8a7

MediaPlayerService: allow next player to be NULL

Bug: 31155917
Bug: 30204103
Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c
(cherry picked from commit 282841278723166e74039329ca56e444ad472daf)

media/libmediaplayerservice/MediaPlayerService.cpp

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