commit 71079fc29d93fb49d6022397b6d4168b7fba6e9b
author Wei Jia <wjia@google.com> Wed Sep 10 10:06:11 2014 -0700
committer Wei Jia <wjia@google.com> Wed Sep 10 11:47:43 2014 -0700
tree 0bd9429e860de402b018ebbc34d236a724531d2f
parent 8716e3f386f37abd3d759404ca8b3deaf46afde8

NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress.

Bug: 17453240
Change-Id: If243e2232779681fc84dc767feaed00f23d8fdb1

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index 35cd514..7dd54c1 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -626,12 +626,15 @@
     switch (msg) {
         case MEDIA_PLAYBACK_COMPLETE:
         {
-            if (mLooping && mState != STATE_RESET_IN_PROGRESS) {
-                mPlayer->seekToAsync(0);
-                break;
+            if (mState != STATE_RESET_IN_PROGRESS) {
+                if (mLooping) {
+                    mPlayer->seekToAsync(0);
+                    break;
+                }
+
+                mPlayer->pause();
+                mState = STATE_PAUSED;
             }
-            mPlayer->pause();
-            mState = STATE_PAUSED;
             // fall through
         }