release-request-957cd691-fb71-4770-8ff7-a3b9602655a5-for-git_oc-mr1-release-4314464 snap-temp-L54400000099147910

Change-Id: Iad699dc406bb61f6975d113dd93c5d84ffbe640c

1 files changed, 6 insertions, 8 deletions

diff --git a/src/com/android/car/media/localmediaplayer/Player.java b/src/com/android/car/media/localmediaplayer/Player.java
index 7b3d151..9aa86be 100644
--- a/src/com/android/car/media/localmediaplayer/Player.java
+++ b/src/com/android/car/media/localmediaplayer/Player.java
@@ -510,18 +510,16 @@ public class Player extends MediaSession.Callback {
         }
 
         // 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);
+        if (mQueue != null && mQueue.size() > 2) {
+            QueueItem current = mQueue.remove(mCurrentQueueIdx);
+            Collections.shuffle(mQueue);
+            mQueue.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));
+            for (int i = 0; i < mQueue.size(); i++) {
+                mQueue.set(i, new QueueItem(mQueue.get(i).getDescription(), i));
             }
-            mQueue = new ArrayList<>(queue);
             mCurrentQueueIdx = 0;
             updateSessionQueueState();
             updatePlaybackStatePlaying();