diff options
| author | Rachad <rachad@google.com> | 2014-09-09 22:04:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-09 22:04:13 +0000 |
| commit | cce5397d6896fcc30211c9aa2061d8c7d07d1a19 (patch) | |
| tree | 2b593534d64662c260c3f278235d0ca75e1ac135 /media | |
| parent | 95821a0f83afc7ca1680de2eb3e9aa903d2ed9ba (diff) | |
| parent | 95861b33c7dcfa450f5e10568c0767b07bc50729 (diff) | |
| download | frameworks_av-cce5397d6896fcc30211c9aa2061d8c7d07d1a19.zip frameworks_av-cce5397d6896fcc30211c9aa2061d8c7d07d1a19.tar.gz frameworks_av-cce5397d6896fcc30211c9aa2061d8c7d07d1a19.tar.bz2 | |
am 95861b33: Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning." into lmp-dev
* commit '95861b33c7dcfa450f5e10568c0767b07bc50729':
NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index aad6e93..067784b 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -893,8 +893,10 @@ void NuPlayer::Renderer::notifyPosition() { } void NuPlayer::Renderer::onPause() { - CHECK(!mPaused); - + if (mPaused) { + ALOGW("Renderer::onPause() called while already paused!"); + return; + } { Mutex::Autolock autoLock(mLock); ++mAudioQueueGeneration; |