commit 01ffe32b7f67f350f4892d6a9c6e956bc72e9933
author Marco Nelissen <marcone@google.com> Wed May 13 16:05:21 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed May 13 16:05:21 2009 -0700
tree 1e1bd985aa15fca6cc3e5bcad77b83b0601ec8fd
parent d4c483b4d47e85cd28658e48cb61056da269cc69
parent 9d989c480204167cf983ba4dc3eac9dec5cddef9

am 9d989c4: Don\'t show menu in oneshot mode, since it\'s not useful and m

Merge commit '9d989c480204167cf983ba4dc3eac9dec5cddef9'

* commit '9d989c480204167cf983ba4dc3eac9dec5cddef9':
  Don't show menu in oneshot mode, since it's not useful and may confuse other parts of the code.

src/com/android/music/MediaPlaybackService.java

diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index b5915b8..7a772c6 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -978,6 +978,12 @@
      */
     public void play() {
         if (mPlayer.isInitialized()) {
+            // if we are at the end of the song, go to the next song first
+            if (mRepeatMode != REPEAT_CURRENT &&
+                mPlayer.position() >= mPlayer.duration() - 1) {
+                next(true);
+            }
+
             mPlayer.start();
             setForeground(true);