commit 47a13d45ae3f05ddb778124484a17d4754c82b7a
author Phil Burk <philburk@google.com> Tue Sep 09 22:03:13 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 09 22:03:13 2014 +0000
tree 976eff24183b4a3b0b8fefd58bb20337ef359776
parent 95861b33c7dcfa450f5e10568c0767b07bc50729
parent cbe165a6f68c90bbdd2b1593387d4072bd80b924

Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

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::onPause() {
-    CHECK(!mPaused);
-
+    if (mPaused) {
+        ALOGW("Renderer::onPause() called while already paused!");
+        return;
+    }
     {
         Mutex::Autolock autoLock(mLock);
         ++mAudioQueueGeneration;