From 7ed1ebea3a6003d7d5eaeab9f0084c4f17c86b17 Mon Sep 17 00:00:00 2001
From: Copybara-Service <copybara-worker@google.com>
Date: Fri, 21 Feb 2025 05:18:57 -0800
Subject: [PATCH] Merge pull request #2139 from
 bubenheimer:handleReplaceMediaItems_removerangecodefix

PiperOrigin-RevId: 729490370
(cherry picked from commit 2b12a574473c6304511f76325e1927ca50c264bf)
---
 .../src/main/java/androidx/media3/common/SimpleBasePlayer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java b/libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java
index 826410bef6..2ffd35960a 100644
--- a/libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java
+++ b/libraries/common/src/main/java/androidx/media3/common/SimpleBasePlayer.java
@@ -3486,6 +3486,9 @@ public abstract class SimpleBasePlayer extends BasePlayer {
   protected ListenableFuture<?> handleReplaceMediaItems(
       int fromIndex, int toIndex, List<MediaItem> mediaItems) {
     ListenableFuture<?> addFuture = handleAddMediaItems(toIndex, mediaItems);
+    if (fromIndex == toIndex) {
+      return addFuture;
+    }
     ListenableFuture<?> removeFuture = handleRemoveMediaItems(fromIndex, toIndex);
     return Util.transformFutureAsync(addFuture, unused -> removeFuture);
   }