Make default implementation of cloneAndMove a no-op

Author: marcbaechinger

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java

@@ -703,7 +703,8 @@ public void moveMediaItems(int fromIndex, int toIndex, int newFromIndex) {
     }
     Timeline oldTimeline = getCurrentTimeline();
     pendingOperationAcks++;
-    moveMediaSourceHolders(fromIndex, toIndex, newFromIndex);
+    Util.moveItems(mediaSourceHolderSnapshots, fromIndex, toIndex, newFromIndex);
+    shuffleOrder = shuffleOrder.cloneAndMove(fromIndex, toIndex, newFromIndex);
     Timeline newTimeline = createMaskingTimeline();
     PlaybackInfo newPlaybackInfo =
         maskTimelineAndPosition(
@@ -725,11 +726,6 @@ public void moveMediaItems(int fromIndex, int toIndex, int newFromIndex) {
         /* repeatCurrentMediaItem= */ false);
   }
 
-  private void moveMediaSourceHolders(int fromIndex, int toIndex, int newFromIndex) {
-    Util.moveItems(mediaSourceHolderSnapshots, fromIndex, toIndex, newFromIndex);
-    shuffleOrder = shuffleOrder.cloneAndMove(fromIndex, toIndex, newFromIndex);
-  }
-
   @Override
   public void replaceMediaItems(int fromIndex, int toIndex, List<MediaItem> mediaItems) {
     verifyApplicationThread();

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/ShuffleOrder.java

@@ -267,7 +267,10 @@ public ShuffleOrder cloneAndClear() {
   ShuffleOrder cloneAndInsert(int insertionIndex, int insertionCount);
 
   /**
-   * Returns a copy of the shuffle order with a range of elements moved.
+   * Returns a copy of the shuffle order to be used after a move.
+   *
+   * <p>The default implementation is a no-op. Custom implementation can choose to re-shuffle when
+   * items are moved.
    *
    * @param indexFrom The starting index in the unshuffled order of the range to move, from before
    *     the move occurs.
@@ -278,8 +281,7 @@ public ShuffleOrder cloneAndClear() {
    * @return A copy of this {@link ShuffleOrder} with the elements moved.
    */
   default ShuffleOrder cloneAndMove(int indexFrom, int indexToExclusive, int newIndexFrom) {
-    return cloneAndRemove(indexFrom, indexToExclusive)
-        .cloneAndInsert(newIndexFrom, indexToExclusive - indexFrom);
+    return this;
   }
 
   /**