commit | 4b459da1ee3bb52ddfcc649dc2686975a9d72ab7 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Aug 30 13:49:06 2016 -0700 |
committer | gitbuildkicker <android-build@google.com> | Tue Aug 30 18:05:24 2016 -0700 |
tree | bfb72c09b0bed862a583cf7ac3d593d35613e625 | |
parent | 45f500ac36958b36afa649c8d68490cd38442252 [diff] |
MediaPlayerService: allow next player to be NULL Bug: 31155917 Bug: 30204103 Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c (cherry picked from commit 282841278723166e74039329ca56e444ad472daf)
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 0483228..f802de1 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; }