diff options
| author | Rachad <rachad@google.com> | 2014-09-09 21:44:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 21:44:15 +0000 |
| commit | 95861b33c7dcfa450f5e10568c0767b07bc50729 (patch) | |
| tree | 7b2a5e79057e732a66fe5952c6dbc1978930eb71 /media | |
| parent | 8270e1d13a101fa946848871b9903b31ff11981f (diff) | |
| parent | 8592dbbdf5339890db2b14f83bcd6da2ffb023d2 (diff) | |
| download | frameworks_av-95861b33c7dcfa450f5e10568c0767b07bc50729.zip frameworks_av-95861b33c7dcfa450f5e10568c0767b07bc50729.tar.gz frameworks_av-95861b33c7dcfa450f5e10568c0767b07bc50729.tar.bz2 | |
Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning." into lmp-dev
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; |