commit eea64f2c253a5455f205fbe9d0cf1661cbc265a4
author Marco Nelissen <marcone@google.com> Fri Aug 02 07:50:14 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 02 07:50:14 2013 -0700
tree 5684b162f2139709ea5173bd7942a67c94bfbd0b
parent 8ef367969a0fd1f678b1f119b67d0ee409ea0389
parent 0bc742fa593d5ce1e6e0fd31b8f2991eed31c7d8

am 0bc742fa: Merge "Music: Music Force Close when the last song is end and repeat is closed."

* commit '0bc742fa593d5ce1e6e0fd31b8f2991eed31c7d8':
  Music: Music Force Close when the last song is end and repeat is closed.

src/com/android/music/MediaPlaybackService.java

diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 99b3b68..d25e929 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -203,7 +203,9 @@
                         mCursor.close();
                         mCursor = null;
                     }
-                    mCursor = getCursorForId(mPlayList[mPlayPos]);
+                    if (mPlayPos >= 0 && mPlayPos < mPlayList.length) {
+                        mCursor = getCursorForId(mPlayList[mPlayPos]);
+                    }
                     notifyChange(META_CHANGED);
                     updateNotification();
                     setNextTrack();