release-request-2c5efa61-1f02-4e74-bfeb-1ca3cd5028bd-for-git_pi-release-4301718 snap-temp-L56500000097146696

Change-Id: Idbeaf11a3ca048164ccd05bda67dfaee174765cb

1 files changed, 13 insertions, 4 deletions

diff --git a/src/com/android/car/media/localmediaplayer/Player.java b/src/com/android/car/media/localmediaplayer/Player.java
index 01f6772..7b3d151 100644
--- a/src/com/android/car/media/localmediaplayer/Player.java
+++ b/src/com/android/car/media/localmediaplayer/Player.java
@@ -509,10 +509,19 @@ public class Player extends MediaSession.Callback {
             Log.d(TAG, "Shuffling");
         }
 
-        if (mQueue != null) {
-            QueueItem current = mQueue.remove(mCurrentQueueIdx);
-            Collections.shuffle(mQueue);
-            mQueue.add(0, current);
+        // rebuild the the queue in a shuffled form.
+        List<QueueItem> queue = mDataModel.getQueue();
+        if (queue != null) {
+            QueueItem current = queue.remove(mCurrentQueueIdx);
+            Collections.shuffle(queue);
+            queue.add(0, current);
+            // A QueueItem contains a queue id that's used as the key for when the user selects
+            // the current play list. This means the QueueItems must be rebuilt to have their new
+            // id's set.
+            for (int i = 0; i < queue.size(); i++) {
+                queue.set(i, new QueueItem(queue.get(i).getDescription(), i));
+            }
+            mQueue = new ArrayList<>(queue);
             mCurrentQueueIdx = 0;
             updateSessionQueueState();
             updatePlaybackStatePlaying();