commit 5965b44cac0c5eb716181d78768ee0673c3113dc
author Marco Nelissen <marcone@google.com> Tue May 05 16:05:17 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue May 05 16:05:17 2009 -0700
tree 74cbe5fda676977ed930320f009f907fff1452cf
parent 8e4221a725541f4b9adeee76cf910a9de9f2ac7e
parent 3fdd97fb21031de30e604d470fc8458b814e6587

am 3fdd97f: Postpone doing actual work in QueryBrowserActivity until it\'

Merge commit '3fdd97fb21031de30e604d470fc8458b814e6587'

* commit '3fdd97fb21031de30e604d470fc8458b814e6587':
  Postpone doing actual work in QueryBrowserActivity until it's bound to the playback service.

src/com/android/music/MediaPlaybackService.java

diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 663da57..f34570d 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -977,6 +977,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);