commit 465faa925d3446cacb05b2fef8607cfb3502a0ff
author Marco Nelissen <marcone@google.com> Fri Feb 26 13:16:23 2010 -0800
committer Marco Nelissen <marcone@google.com> Fri Feb 26 13:16:23 2010 -0800
tree 6cc081f07b7682043cbfef16e7e96ea40d1b4656
parent 16f6354be4bd649c0da66cf75f11f1088293aca2

When we're in the 'playback complete' state, don't consider pausing
an error. This makes 'playback complete' essentially equivalent to
being paused at the end, and treats it the same as being paused at
any other position.

media/libmedia/mediaplayer.cpp

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 2157814..d2cec0c 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -304,7 +304,7 @@
 {
     LOGV("pause");
     Mutex::Autolock _l(mLock);
-    if (mCurrentState & MEDIA_PLAYER_PAUSED)
+    if (mCurrentState & (MEDIA_PLAYER_PAUSED|MEDIA_PLAYER_PLAYBACK_COMPLETE))
         return NO_ERROR;
     if ((mPlayer != 0) && (mCurrentState & MEDIA_PLAYER_STARTED)) {
         status_t ret = mPlayer->pause();