Merge commit 'korg/cupcake'

diff --combined src/com/android/music/MediaPlaybackService.java
index 6c5f1f9,deedf27..cfad551
--- 1/src/com/android/music/MediaPlaybackService.java
--- 2/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@@ -760,6 -760,7 +760,7 @@@ public class MediaPlaybackService exten
              if (mShuffleMode == SHUFFLE_AUTO) {
                  mShuffleMode = SHUFFLE_NORMAL;
              }
+             int oldId = getAudioId();
              int listlength = list.length;
              boolean newlist = true;
              if (mPlayListLen == listlength) {
@@@ -786,8 -787,7 +787,7 @@@
  
              saveBookmarkIfNeeded();
              openCurrent();
-             if (!newlist && mPlayPos != oldpos) {
-                 // the queue didn't change, but the position did
+             if (oldId != getAudioId()) {
                  notifyChange(META_CHANGED);
              }
          }
@@@ -977,12 -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);