diff options
| author | Wei Jia <wjia@google.com> | 2014-09-11 10:12:58 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2014-09-11 10:12:58 -0700 |
| commit | 2c6b6000404d939be92193209dbd147ccd70d2e1 (patch) | |
| tree | 1587680a52622649a749acb7066c854eaeb3ef5b /media | |
| parent | a0695097f3a52d5e88eb167d10a7e8de7315d823 (diff) | |
| parent | 42db212edc507588768479ec91acfb97b49b2837 (diff) | |
| download | frameworks_av-2c6b6000404d939be92193209dbd147ccd70d2e1.zip frameworks_av-2c6b6000404d939be92193209dbd147ccd70d2e1.tar.gz frameworks_av-2c6b6000404d939be92193209dbd147ccd70d2e1.tar.bz2 | |
resolved conflicts for merge of 42db212e to master
Change-Id: I1d8fe79a591b0e2a9e279f6c2c70d9e13c72924b
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index ae8ee43..df19aef 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -637,14 +637,15 @@ void NuPlayerDriver::notifyListener_l( switch (msg) { case MEDIA_PLAYBACK_COMPLETE: { - if (mLooping && mState != STATE_RESET_IN_PROGRESS) { - mPlayer->seekToAsync(0); - break; - } else { + if (mState != STATE_RESET_IN_PROGRESS) { + if (mLooping) { + mPlayer->seekToAsync(0); + break; + } + + mPlayer->pause(); mState = STATE_PAUSED; } - mPlayer->pause(); - mState = STATE_PAUSED; // fall through } |