diff options
| author | Wei Jia <wjia@google.com> | 2014-09-23 10:55:35 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-09-23 18:06:39 -0700 |
| commit | 686589f91b92cdcd3a7b85b49a3fe7d09913e66c (patch) | |
| tree | 507404b4e8573d24e0e0431af971875f097fc4e9 | |
| parent | 1824bd8d902a4427f46311f0c6e9f82eda607325 (diff) | |
| download | frameworks_av-686589f91b92cdcd3a7b85b49a3fe7d09913e66c.zip frameworks_av-686589f91b92cdcd3a7b85b49a3fe7d09913e66c.tar.gz frameworks_av-686589f91b92cdcd3a7b85b49a3fe7d09913e66c.tar.bz2 | |
NuPlayer: change assert to conditional check.
Bug: 17491050
Change-Id: I657866c5342c227d57617eb89955897171eb5976
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index b589909..2ea12ae 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -984,17 +984,31 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { case kWhatPause: { - CHECK(mRenderer != NULL); - mSource->pause(); - mRenderer->pause(); + if (mSource != NULL) { + mSource->pause(); + } else { + ALOGW("pause called when source is gone or not set"); + } + if (mRenderer != NULL) { + mRenderer->pause(); + } else { + ALOGW("pause called when renderer is gone or not set"); + } break; } case kWhatResume: { - CHECK(mRenderer != NULL); - mSource->resume(); - mRenderer->resume(); + if (mSource != NULL) { + mSource->resume(); + } else { + ALOGW("resume called when source is gone or not set"); + } + if (mRenderer != NULL) { + mRenderer->resume(); + } else { + ALOGW("resume called when renderer is gone or not set"); + } break; } |