commit | 8055bf65759c01e09ac44c56b034d7fd51201862 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Aug 30 13:49:06 2016 -0700 |
committer | Wei Jia <wjia@google.com> | Tue Aug 30 21:38:46 2016 +0000 |
tree | 950855a781692f1e0a226b07a79205cfb5c56ba0 | |
parent | d60bac90266f3862ed60852b6de5b00cab389fb7 [diff] |
MediaPlayerService: allow next player to be NULL Bug: 31155917 Bug: 30204103 Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index c5a6e49..bd16e91 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; }