commit 680a4cb421dd2712f2ed4880723073762a623d37
author Marco Nelissen <marcone@google.com> Tue Aug 20 10:28:11 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 20 10:28:11 2013 -0700
tree d06ada73fa743c58226e22d2578478e0424f2dd3
parent 7e2c5e49e2275407fcf3601bce54a49807724cf5
parent 70b80e0c42d3f9fd890afccbcb8fe32abc74a615

am 70b80e0c: Merge "Fixed the Music app crash issue when the repeat button is disabled."

* commit '70b80e0c42d3f9fd890afccbcb8fe32abc74a615':
  Fixed the Music app crash issue when the repeat button is disabled.

src/com/android/music/MediaPlaybackService.java

diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index d25e929..25d60c7 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -1089,6 +1089,8 @@
         if (mNextPlayPos >= 0) {
             long id = mPlayList[mNextPlayPos];
             mPlayer.setNextDataSource(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + "/" + id);
+        } else {
+            mPlayer.setNextDataSource(null);
         }
     }