| commit | 50b9d889e637ff3c26e4582edc91ff0c2111fd6d | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Aug 31 00:19:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 00:19:57 2016 +0000 |
| tree | 90244540828ebd99330d9d8e6f7d14b72f7bfc91 | |
| parent | f49ac6ef61935ad636305dd1f3a3d4964b7c4f61 [diff] | |
| parent | 629e78c10f0b81831a385197cc7c167d753d1683 [diff] |
MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a am: 0dd714e408 am: de97dbd662 am: a7549d3dce am: c6fdb3d696 am: 629e78c10f Change-Id: I14c17d063743ca79f43f674c2d4cbcb57f90451e
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 925e24e..4b40b99 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; }