| commit | 629e78c10f0b81831a385197cc7c167d753d1683 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Aug 31 00:16:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 00:16:56 2016 +0000 |
| tree | 55465416c5fcc5325020162026447a59f1ad63b6 | |
| parent | 6f8e939c584047179483840480f10dbc956d70f6 [diff] | |
| parent | c6fdb3d6964988ed576fbe393401fbd10c15d86d [diff] |
MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a am: 0dd714e408 am: de97dbd662 am: a7549d3dce am: c6fdb3d696 Change-Id: I6e1cb16e9c281bda0375f552aab01b2ee069c14b
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 468ed27..d237726 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1000,7 +1000,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; }