commit 4d03d0d14dc21e4ce1dbd080f5d1baf24bf09e66
author Wei Jia <wjia@google.com> Wed Aug 31 00:28:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 31 00:28:27 2016 +0000
tree 3acd35eacb0911f9ea6fd285399bb681975abf9f
parent f225daf883e0c7eed51bec7fadc897fa6a0a2418
parent 31407677bcf5216234c0caa12259fccd63d4d13c

MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a am: 0dd714e408 am: de97dbd662 am: a7549d3dce am: c6fdb3d696 am: 629e78c10f am: 50b9d889e6 am: 81e0557519
am: 31407677bc

Change-Id: I0dba90208e5a8f316658e3521544445fa00614cc

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 38437b9..198602d 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1062,7 +1062,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;
     }