| commit | c6fdb3d6964988ed576fbe393401fbd10c15d86d | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Aug 31 00:13:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 00:13:56 2016 +0000 |
| tree | 759113fc77f9124a29d48987f4620676a91dd136 | |
| parent | 82bc8c451132353b9f2a269c0387e705f79fdc2d [diff] | |
| parent | a7549d3dce0b313c8d22d54e43217d822393e5ae [diff] |
MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a am: 0dd714e408 am: de97dbd662 am: a7549d3dce Change-Id: I56c379ef39b1fd80493798de79a61db140646c50
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index ef28c12..a39bb65 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1014,7 +1014,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; }