commit | c19aa4304ea5349e2c857d4df497e5039ef72bec | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Tue Aug 30 13:49:06 2016 -0700 |
committer | Feng Yu <feny@google.com> | Tue Aug 30 23:34:09 2016 +0000 |
tree | ee3f5ea7f7618cecf01fee908f276e87f4d0c3b9 | |
parent | dcb0b5e835244f10b748879d8c26b28d619c80c6 [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 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; }