diff options
| author | Rachad <rachad@google.com> | 2014-09-09 13:10:28 -0700 |
|---|---|---|
| committer | Rachad <rachad@google.com> | 2014-09-09 13:10:28 -0700 |
| commit | 8592dbbdf5339890db2b14f83bcd6da2ffb023d2 (patch) | |
| tree | ede1d13d4f3eb963032215ecb6999209f666d53a /media | |
| parent | 9f8551ffa967bd8a4d0a52487a183dcf8b22d91f (diff) | |
| download | frameworks_av-8592dbbdf5339890db2b14f83bcd6da2ffb023d2.zip frameworks_av-8592dbbdf5339890db2b14f83bcd6da2ffb023d2.tar.gz frameworks_av-8592dbbdf5339890db2b14f83bcd6da2ffb023d2.tar.bz2 | |
NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
Bug: 17436451
Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
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; |