Migrate media3.session references from Window to MediaItem

#minor-release

PiperOrigin-RevId: 405927299

libraries/session/src/main/java/androidx/media3/session/MediaController.java

@@ -1270,7 +1270,7 @@ public class MediaController implements Player {
   @Override
   public int getCurrentMediaItemIndex() {
     verifyApplicationThread();
-    return isConnected() ? impl.getCurrentWindowIndex() : C.INDEX_UNSET;
+    return isConnected() ? impl.getCurrentMediaItemIndex() : C.INDEX_UNSET;
   }
 
   @UnstableApi
@@ -1291,7 +1291,7 @@ public class MediaController implements Player {
   @Override
   public int getPreviousMediaItemIndex() {
     verifyApplicationThread();
-    return isConnected() ? impl.getPreviousWindowIndex() : C.INDEX_UNSET;
+    return isConnected() ? impl.getPreviousMediaItemIndex() : C.INDEX_UNSET;
   }
 
   @UnstableApi
@@ -1312,7 +1312,7 @@ public class MediaController implements Player {
   @Override
   public int getNextMediaItemIndex() {
     verifyApplicationThread();
-    return isConnected() ? impl.getNextWindowIndex() : C.INDEX_UNSET;
+    return isConnected() ? impl.getNextMediaItemIndex() : C.INDEX_UNSET;
   }
 
   @UnstableApi
@@ -1348,13 +1348,13 @@ public class MediaController implements Player {
   @Override
   public boolean hasPreviousMediaItem() {
     verifyApplicationThread();
-    return isConnected() && impl.hasPreviousWindow();
+    return isConnected() && impl.hasPreviousMediaItem();
   }
 
   @Override
   public boolean hasNextMediaItem() {
     verifyApplicationThread();
-    return isConnected() && impl.hasNextWindow();
+    return isConnected() && impl.hasNextMediaItem();
   }
 
   @UnstableApi
@@ -1392,7 +1392,7 @@ public class MediaController implements Player {
       Log.w(TAG, "The controller is not connected. Ignoring seekToPreviousMediaItem().");
       return;
     }
-    impl.seekToPreviousWindow();
+    impl.seekToPreviousMediaItem();
   }
 
   @UnstableApi
@@ -1416,7 +1416,7 @@ public class MediaController implements Player {
       Log.w(TAG, "The controller is not connected. Ignoring seekToNextMediaItem().");
       return;
     }
-    impl.seekToNextWindow();
+    impl.seekToNextMediaItem();
   }
 
   /**
@@ -1824,7 +1824,6 @@ public class MediaController implements Player {
     checkState(Looper.myLooper() == getApplicationLooper(), WRONG_THREAD_ERROR_MESSAGE);
   }
 
-  // TODO(b/202157117): Rename Window references to MediaItem.
   interface MediaControllerImpl {
 
     void addListener(Player.Listener listener);
@@ -1850,11 +1849,11 @@ public class MediaController implements Player {
 
     void seekToDefaultPosition();
 
-    void seekToDefaultPosition(int windowIndex);
+    void seekToDefaultPosition(int mediaItemIndex);
 
     void seekTo(long positionMs);
 
-    void seekTo(int windowIndex, long positionMs);
+    void seekTo(int mediaItemIndex, long positionMs);
 
     long getSeekBackIncrement();
 
@@ -1920,7 +1919,7 @@ public class MediaController implements Player {
 
     void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition);
 
-    void setMediaItems(List<MediaItem> mediaItems, int startWindowIndex, long startPositionMs);
+    void setMediaItems(List<MediaItem> mediaItems, int startIndex, long startPositionMs);
 
     ListenableFuture<SessionResult> setMediaUri(Uri uri, Bundle extras);
 
@@ -1948,19 +1947,19 @@ public class MediaController implements Player {
 
     int getCurrentPeriodIndex();
 
-    int getCurrentWindowIndex();
+    int getCurrentMediaItemIndex();
 
-    int getPreviousWindowIndex();
+    int getPreviousMediaItemIndex();
 
-    int getNextWindowIndex();
+    int getNextMediaItemIndex();
 
-    boolean hasPreviousWindow();
+    boolean hasPreviousMediaItem();
 
-    boolean hasNextWindow();
+    boolean hasNextMediaItem();
 
-    void seekToPreviousWindow();
+    void seekToPreviousMediaItem();
 
-    void seekToNextWindow();
+    void seekToNextMediaItem();
 
     void seekToPrevious();
 

libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java

@@ -488,11 +488,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
           }
         });
 
-    seekToInternal(getCurrentWindowIndex(), /* positionMs= */ C.TIME_UNSET);
+    seekToInternal(getCurrentMediaItemIndex(), /* positionMs= */ C.TIME_UNSET);
   }
 
   @Override
-  public void seekToDefaultPosition(int windowIndex) {
+  public void seekToDefaultPosition(int mediaItemIndex) {
     if (!isPlayerCommandAvailable(COMMAND_SEEK_TO_MEDIA_ITEM)) {
       return;
     }
@@ -502,11 +502,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
         new RemoteSessionTask() {
           @Override
           public void run(IMediaSession iSession, int seq) throws RemoteException {
-            iSession.seekToDefaultPositionWithMediaItemIndex(controllerStub, seq, windowIndex);
+            iSession.seekToDefaultPositionWithMediaItemIndex(controllerStub, seq, mediaItemIndex);
           }
         });
 
-    seekToInternal(windowIndex, /* positionMs= */ C.TIME_UNSET);
+    seekToInternal(mediaItemIndex, /* positionMs= */ C.TIME_UNSET);
   }
 
   @Override
@@ -524,11 +524,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
           }
         });
 
-    seekToInternal(getCurrentWindowIndex(), positionMs);
+    seekToInternal(getCurrentMediaItemIndex(), positionMs);
   }
 
   @Override
-  public void seekTo(int windowIndex, long positionMs) {
+  public void seekTo(int mediaItemIndex, long positionMs) {
     if (!isPlayerCommandAvailable(COMMAND_SEEK_TO_MEDIA_ITEM)) {
       return;
     }
@@ -538,11 +538,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
         new RemoteSessionTask() {
           @Override
           public void run(IMediaSession iSession, int seq) throws RemoteException {
-            iSession.seekToWithMediaItemIndex(controllerStub, seq, windowIndex, positionMs);
+            iSession.seekToWithMediaItemIndex(controllerStub, seq, mediaItemIndex, positionMs);
           }
         });
 
-    seekToInternal(windowIndex, positionMs);
+    seekToInternal(mediaItemIndex, positionMs);
   }
 
   @Override
@@ -817,7 +817,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
     setMediaItemsInternal(
         Collections.singletonList(mediaItem),
-        /* startWindowIndex= */ C.INDEX_UNSET,
+        /* startIndex= */ C.INDEX_UNSET,
         /* startPositionMs= */ C.TIME_UNSET,
         /* resetToDefaultPosition= */ false);
   }
@@ -836,7 +836,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
     setMediaItemsInternal(
         Collections.singletonList(mediaItem),
-        /* startWindowIndex= */ C.INDEX_UNSET,
+        /* startIndex= */ C.INDEX_UNSET,
         /* startPositionMs= */ startPositionMs,
         /* resetToDefaultPosition= */ false);
   }
@@ -855,7 +855,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
     setMediaItemsInternal(
         Collections.singletonList(mediaItem),
-        /* startWindowIndex= */ C.INDEX_UNSET,
+        /* startIndex= */ C.INDEX_UNSET,
         /* startPositionMs= */ C.TIME_UNSET,
         /* resetToDefaultPosition= */ resetPosition);
   }
@@ -876,7 +876,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
     setMediaItemsInternal(
         mediaItems,
-        /* startWindowIndex= */ C.INDEX_UNSET,
+        /* startIndex= */ C.INDEX_UNSET,
         /* startPositionMs= */ C.TIME_UNSET,
         /* resetToDefaultPosition= */ false);
   }
@@ -898,14 +898,13 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
     setMediaItemsInternal(
         mediaItems,
-        /* startWindowIndex= */ C.INDEX_UNSET,
+        /* startIndex= */ C.INDEX_UNSET,
         /* startPositionMs= */ C.TIME_UNSET,
         /* resetToDefaultPosition= */ resetPosition);
   }
 
   @Override
-  public void setMediaItems(
-      List<MediaItem> mediaItems, int startWindowIndex, long startPositionMs) {
+  public void setMediaItems(List<MediaItem> mediaItems, int startIndex, long startPositionMs) {
     if (!isPlayerCommandAvailable(COMMAND_CHANGE_MEDIA_ITEMS)) {
       return;
     }
@@ -917,11 +916,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
                 controllerStub,
                 seq,
                 new BundleListRetriever(BundleableUtil.toBundleList(mediaItems)),
-                startWindowIndex,
+                startIndex,
                 startPositionMs));
 
     setMediaItemsInternal(
-        mediaItems, startWindowIndex, startPositionMs, /* resetToDefaultPosition= */ false);
+        mediaItems, startIndex, startPositionMs, /* resetToDefaultPosition= */ false);
   }
 
   @Override
@@ -1132,39 +1131,39 @@ import org.checkerframework.checker.nullness.qual.NonNull;
     rebuildPeriods(oldTimeline, newWindows, newPeriods);
     Timeline newTimeline = createMaskingTimeline(newWindows, newPeriods);
 
-    int oldWindowIndex = getCurrentWindowIndex();
-    int newWindowIndex = oldWindowIndex;
+    int oldMediaItemIndex = getCurrentMediaItemIndex();
+    int newMediaItemIndex = oldMediaItemIndex;
     int oldPeriodIndex = playerInfo.sessionPositionInfo.positionInfo.periodIndex;
     int newPeriodIndex = oldPeriodIndex;
     boolean currentItemRemoved =
-        getCurrentWindowIndex() >= fromIndex && getCurrentWindowIndex() < clippedToIndex;
+        getCurrentMediaItemIndex() >= fromIndex && getCurrentMediaItemIndex() < clippedToIndex;
     Window window = new Window();
     if (oldTimeline.isEmpty()) {
       // No masking required. Just forwarding command to session.
     } else {
       if (newTimeline.isEmpty()) {
-        newWindowIndex = C.INDEX_UNSET;
+        newMediaItemIndex = C.INDEX_UNSET;
         newPeriodIndex = 0;
       } else {
         if (currentItemRemoved) {
-          int oldNextWindowIndex =
-              resolveSubsequentWindowIndex(
+          int oldNextMediaItemIndex =
+              resolveSubsequentMediaItemIndex(
                   getRepeatMode(),
                   getShuffleModeEnabled(),
-                  oldWindowIndex,
+                  oldMediaItemIndex,
                   oldTimeline,
                   fromIndex,
                   toIndex);
-          if (oldNextWindowIndex == C.INDEX_UNSET) {
-            newWindowIndex = newTimeline.getFirstWindowIndex(getShuffleModeEnabled());
-          } else if (oldNextWindowIndex >= clippedToIndex) {
-            newWindowIndex = oldNextWindowIndex - (clippedToIndex - fromIndex);
+          if (oldNextMediaItemIndex == C.INDEX_UNSET) {
+            newMediaItemIndex = newTimeline.getFirstWindowIndex(getShuffleModeEnabled());
+          } else if (oldNextMediaItemIndex >= clippedToIndex) {
+            newMediaItemIndex = oldNextMediaItemIndex - (clippedToIndex - fromIndex);
           } else {
-            newWindowIndex = oldNextWindowIndex;
+            newMediaItemIndex = oldNextMediaItemIndex;
           }
-          newPeriodIndex = newTimeline.getWindow(newWindowIndex, window).firstPeriodIndex;
-        } else if (oldWindowIndex >= clippedToIndex) {
-          newWindowIndex -= (clippedToIndex - fromIndex);
+          newPeriodIndex = newTimeline.getWindow(newMediaItemIndex, window).firstPeriodIndex;
+        } else if (oldMediaItemIndex >= clippedToIndex) {
+          newMediaItemIndex -= (clippedToIndex - fromIndex);
           newPeriodIndex =
               getNewPeriodIndexWithoutRemovedPeriods(
                   oldTimeline, oldPeriodIndex, fromIndex, clippedToIndex);
@@ -1174,7 +1173,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
       PlayerInfo newPlayerInfo;
       if (currentItemRemoved) {
         PositionInfo newPositionInfo;
-        if (newWindowIndex == C.INDEX_UNSET) {
+        if (newMediaItemIndex == C.INDEX_UNSET) {
           newPositionInfo = SessionPositionInfo.DEFAULT_POSITION_INFO;
           newPlayerInfo =
               maskTimelineAndPositionInfo(
@@ -1184,13 +1183,13 @@ import org.checkerframework.checker.nullness.qual.NonNull;
                   SessionPositionInfo.DEFAULT,
                   DISCONTINUITY_REASON_REMOVE);
         } else {
-          Window newWindow = newTimeline.getWindow(newWindowIndex, new Window());
+          Window newWindow = newTimeline.getWindow(newMediaItemIndex, new Window());
           long defaultPositionMs = newWindow.getDefaultPositionMs();
           long durationMs = newWindow.getDurationMs();
           newPositionInfo =
               new PositionInfo(
                   /* windowUid= */ null,
-                  newWindowIndex,
+                  newMediaItemIndex,
                   newWindow.mediaItem,
                   /* periodUid= */ null,
                   newPeriodIndex,
@@ -1222,7 +1221,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
             maskTimelineAndPositionInfo(
                 playerInfo,
                 newTimeline,
-                newWindowIndex,
+                newMediaItemIndex,
                 newPeriodIndex,
                 DISCONTINUITY_REASON_REMOVE);
       }
@@ -1233,7 +1232,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
               && newPlayerInfo.playbackState != STATE_ENDED
               && fromIndex < clippedToIndex
               && clippedToIndex == oldTimeline.getWindowCount()
-              && getCurrentWindowIndex() >= fromIndex;
+              && getCurrentMediaItemIndex() >= fromIndex;
       if (transitionsToEnded) {
         newPlayerInfo = newPlayerInfo.copyWithPlaybackState(STATE_ENDED, /* playerError= */ null);
       }
@@ -1299,7 +1298,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
   }
 
   @Override
-  public int getCurrentWindowIndex() {
+  public int getCurrentMediaItemIndex() {
     return playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex == C.INDEX_UNSET
         ? 0
         : playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex;
@@ -1307,38 +1306,38 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
   // TODO(b/184479406): Get the index directly from Player rather than Timeline.
   @Override
-  public int getPreviousWindowIndex() {
+  public int getPreviousMediaItemIndex() {
     return playerInfo.timeline.isEmpty()
         ? C.INDEX_UNSET
         : playerInfo.timeline.getPreviousWindowIndex(
-            getCurrentWindowIndex(),
+            getCurrentMediaItemIndex(),
             convertRepeatModeForNavigation(playerInfo.repeatMode),
             playerInfo.shuffleModeEnabled);
   }
 
   // TODO(b/184479406): Get the index directly from Player rather than Timeline.
   @Override
-  public int getNextWindowIndex() {
+  public int getNextMediaItemIndex() {
     return playerInfo.timeline.isEmpty()
         ? C.INDEX_UNSET
         : playerInfo.timeline.getNextWindowIndex(
-            getCurrentWindowIndex(),
+            getCurrentMediaItemIndex(),
             convertRepeatModeForNavigation(playerInfo.repeatMode),
             playerInfo.shuffleModeEnabled);
   }
 
   @Override
-  public boolean hasPreviousWindow() {
-    return getPreviousWindowIndex() != C.INDEX_UNSET;
+  public boolean hasPreviousMediaItem() {
+    return getPreviousMediaItemIndex() != C.INDEX_UNSET;
   }
 
   @Override
-  public boolean hasNextWindow() {
-    return getNextWindowIndex() != C.INDEX_UNSET;
+  public boolean hasNextMediaItem() {
+    return getNextMediaItemIndex() != C.INDEX_UNSET;
   }
 
   @Override
-  public void seekToPreviousWindow() {
+  public void seekToPreviousMediaItem() {
     if (!isPlayerCommandAvailable(COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM)) {
       return;
     }
@@ -1347,13 +1346,13 @@ import org.checkerframework.checker.nullness.qual.NonNull;
         COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM,
         (iSession, seq) -> iSession.seekToPreviousMediaItem(controllerStub, seq));
 
-    if (getPreviousWindowIndex() != C.INDEX_UNSET) {
-      seekToInternal(getPreviousWindowIndex(), /* positionMs= */ C.TIME_UNSET);
+    if (getPreviousMediaItemIndex() != C.INDEX_UNSET) {
+      seekToInternal(getPreviousMediaItemIndex(), /* positionMs= */ C.TIME_UNSET);
     }
   }
 
   @Override
-  public void seekToNextWindow() {
+  public void seekToNextMediaItem() {
     if (!isPlayerCommandAvailable(COMMAND_SEEK_TO_NEXT_MEDIA_ITEM)) {
       return;
     }
@@ -1362,8 +1361,8 @@ import org.checkerframework.checker.nullness.qual.NonNull;
         COMMAND_SEEK_TO_NEXT_MEDIA_ITEM,
         (iSession, seq) -> iSession.seekToNextMediaItem(controllerStub, seq));
 
-    if (getNextWindowIndex() != C.INDEX_UNSET) {
-      seekToInternal(getNextWindowIndex(), /* positionMs= */ C.TIME_UNSET);
+    if (getNextMediaItemIndex() != C.INDEX_UNSET) {
+      seekToInternal(getNextMediaItemIndex(), /* positionMs= */ C.TIME_UNSET);
     }
   }
 
@@ -1380,16 +1379,16 @@ import org.checkerframework.checker.nullness.qual.NonNull;
     if (timeline.isEmpty() || isPlayingAd()) {
       return;
     }
-    boolean hasPreviousWindow = hasPreviousWindow();
-    Window window = timeline.getWindow(getCurrentWindowIndex(), new Window());
+    boolean hasPreviousMediaItem = hasPreviousMediaItem();
+    Window window = timeline.getWindow(getCurrentMediaItemIndex(), new Window());
     if (window.isDynamic && window.isLive()) {
-      if (hasPreviousWindow) {
-        seekToInternal(getPreviousWindowIndex(), /* positionMs= */ C.TIME_UNSET);
+      if (hasPreviousMediaItem) {
+        seekToInternal(getPreviousMediaItemIndex(), /* positionMs= */ C.TIME_UNSET);
       }
-    } else if (hasPreviousWindow && getCurrentPosition() <= getMaxSeekToPreviousPosition()) {
-      seekToInternal(getPreviousWindowIndex(), /* positionMs= */ C.TIME_UNSET);
+    } else if (hasPreviousMediaItem && getCurrentPosition() <= getMaxSeekToPreviousPosition()) {
+      seekToInternal(getPreviousMediaItemIndex(), /* positionMs= */ C.TIME_UNSET);
     } else {
-      seekToInternal(getCurrentWindowIndex(), /* positionMs= */ 0);
+      seekToInternal(getCurrentMediaItemIndex(), /* positionMs= */ 0);
     }
   }
 
@@ -1411,12 +1410,12 @@ import org.checkerframework.checker.nullness.qual.NonNull;
     if (timeline.isEmpty() || isPlayingAd()) {
       return;
     }
-    if (hasNextWindow()) {
-      seekToInternal(getNextWindowIndex(), /* positionMs= */ C.TIME_UNSET);
+    if (hasNextMediaItem()) {
+      seekToInternal(getNextMediaItemIndex(), /* positionMs= */ C.TIME_UNSET);
     } else {
-      Window window = timeline.getWindow(getCurrentWindowIndex(), new Window());
+      Window window = timeline.getWindow(getCurrentMediaItemIndex(), new Window());
       if (window.isDynamic && window.isLive()) {
-        seekToInternal(getCurrentWindowIndex(), /* positionMs= */ C.TIME_UNSET);
+        seekToInternal(getCurrentMediaItemIndex(), /* positionMs= */ C.TIME_UNSET);
       }
     }
   }
@@ -1944,7 +1943,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
     Timeline newTimeline = createMaskingTimeline(newWindows, newPeriods);
 
     if (!newTimeline.isEmpty()) {
-      int oldWindowIndex = getCurrentWindowIndex();
+      int oldWindowIndex = getCurrentMediaItemIndex();
       int newWindowIndex = oldWindowIndex;
       if (oldWindowIndex >= fromIndex && oldWindowIndex < toIndex) {
         // if old window index was part of items that should be moved.
@@ -1991,7 +1990,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
       positionMs = min(positionMs, durationMs);
     }
     positionMs = max(positionMs, 0);
-    seekToInternal(getCurrentWindowIndex(), positionMs);
+    seekToInternal(getCurrentMediaItemIndex(), positionMs);
   }
 
   private void seekToInternal(int windowIndex, long positionMs) {
@@ -2865,28 +2864,28 @@ import org.checkerframework.checker.nullness.qual.NonNull;
     }
   }
 
-  private static int resolveSubsequentWindowIndex(
+  private static int resolveSubsequentMediaItemIndex(
       @RepeatMode int repeatMode,
       boolean shuffleModeEnabled,
-      int oldWindowIndex,
+      int oldMediaItemIndex,
       Timeline oldTimeline,
       int fromIndex,
       int toIndex) {
-    int newWindowIndex = C.INDEX_UNSET;
+    int newMediaItemIndex = C.INDEX_UNSET;
     int maxIterations = oldTimeline.getWindowCount();
     for (int i = 0; i < maxIterations; i++) {
-      oldWindowIndex =
-          oldTimeline.getNextWindowIndex(oldWindowIndex, repeatMode, shuffleModeEnabled);
-      if (oldWindowIndex == C.INDEX_UNSET) {
+      oldMediaItemIndex =
+          oldTimeline.getNextWindowIndex(oldMediaItemIndex, repeatMode, shuffleModeEnabled);
+      if (oldMediaItemIndex == C.INDEX_UNSET) {
         // We've reached the end of the old timeline.
         break;
       }
-      if (oldWindowIndex < fromIndex || oldWindowIndex >= toIndex) {
-        newWindowIndex = oldWindowIndex;
+      if (oldMediaItemIndex < fromIndex || oldMediaItemIndex >= toIndex) {
+        newMediaItemIndex = oldMediaItemIndex;
         break;
       }
     }
-    return newWindowIndex;
+    return newMediaItemIndex;
   }
 
   // This will be called on the main thread.

libraries/session/src/main/java/androidx/media3/session/MediaControllerImplLegacy.java

@@ -352,48 +352,49 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   @Override
   public void seekToDefaultPosition() {
-    seekToInternal(getCurrentWindowIndex(), /* positionMs= */ 0);
+    seekToInternal(getCurrentMediaItemIndex(), /* positionMs= */ 0);
   }
 
   @Override
-  public void seekToDefaultPosition(int windowIndex) {
-    seekToInternal(windowIndex, /* positionMs= */ 0);
+  public void seekToDefaultPosition(int mediaItemIndex) {
+    seekToInternal(mediaItemIndex, /* positionMs= */ 0);
   }
 
   @Override
   public void seekTo(long positionMs) {
-    seekToInternal(getCurrentWindowIndex(), positionMs);
+    seekToInternal(getCurrentMediaItemIndex(), positionMs);
   }
 
   @Override
-  public void seekTo(int windowIndex, long positionMs) {
-    seekToInternal(windowIndex, positionMs);
+  public void seekTo(int mediaItemIndex, long positionMs) {
+    seekToInternal(mediaItemIndex, positionMs);
   }
 
-  private void seekToInternal(int windowIndex, long positionMs) {
-    int currentWindowIndex = getCurrentWindowIndex();
+  private void seekToInternal(int mediaItemIndex, long positionMs) {
+    int currentMediaItemIndex = getCurrentMediaItemIndex();
     Timeline currentTimeline = controllerInfo.playerInfo.timeline;
-    if (currentWindowIndex != windowIndex
-        && (windowIndex < 0 || windowIndex >= currentTimeline.getWindowCount())) {
-      throw new IllegalSeekPositionException(currentTimeline, windowIndex, positionMs);
+    if (currentMediaItemIndex != mediaItemIndex
+        && (mediaItemIndex < 0 || mediaItemIndex >= currentTimeline.getWindowCount())) {
+      throw new IllegalSeekPositionException(currentTimeline, mediaItemIndex, positionMs);
     }
     if (isPlayingAd()) {
       return;
     }
-    int newWindowIndex = currentWindowIndex;
+    int newMediaItemIndex = currentMediaItemIndex;
     @MediaItemTransitionReason int mediaItemTransitionReason = C.INDEX_UNSET;
-    if (windowIndex != currentWindowIndex) {
+    if (mediaItemIndex != currentMediaItemIndex) {
       QueueTimeline queueTimeline = (QueueTimeline) controllerInfo.playerInfo.timeline;
-      long queueId = queueTimeline.getQueueId(windowIndex);
+      long queueId = queueTimeline.getQueueId(mediaItemIndex);
       if (queueId != QueueItem.UNKNOWN_ID) {
         controllerCompat.getTransportControls().skipToQueueItem(queueId);
-        newWindowIndex = windowIndex;
+        newMediaItemIndex = mediaItemIndex;
         mediaItemTransitionReason = MEDIA_ITEM_TRANSITION_REASON_SEEK;
       } else {
         Log.w(
             TAG,
-            "Cannot seek to new window due to the missing queue Id at window, windowIndex="
-                + windowIndex);
+            "Cannot seek to new media item due to the missing queue Id at media item,"
+                + " mediaItemIndex="
+                + mediaItemIndex);
       }
     }
     @DiscontinuityReason int discontinuityReason;
@@ -433,9 +434,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     }
     PositionInfo positionInfo =
         createPositionInfo(
-            newWindowIndex,
+            newMediaItemIndex,
             !currentTimeline.isEmpty()
-                ? currentTimeline.getWindow(newWindowIndex, new Window()).mediaItem
+                ? currentTimeline.getWindow(newMediaItemIndex, new Window()).mediaItem
                 : null,
             newPositionMs);
     PlayerInfo maskedPlayerInfo =
@@ -522,7 +523,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   @Override
   public long getCurrentLiveOffset() {
-    // We can't know whether it's live window or not.
+    // We can't know whether the content is live or not.
     return C.TIME_UNSET;
   }
 
@@ -675,7 +676,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   @Override
   public void setMediaItems(
-      List<MediaItem> unusedMediaItems, int unusedStartWindowIndex, long unusedStartPositionMs) {
+      List<MediaItem> unusedMediaItems, int unusedStartIndex, long unusedStartPositionMs) {
     Log.w(TAG, "Session doesn't support setting media items");
   }
 
@@ -742,11 +743,11 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     QueueTimeline queueTimeline = (QueueTimeline) controllerInfo.playerInfo.timeline;
     QueueTimeline newQueueTimeline = queueTimeline.copyWithNewMediaItems(index, mediaItems);
-    int currentWindowIndex = getCurrentWindowIndex();
-    int newCurrentWindowIndex =
-        calculateCurrentItemIndexAfterAddItems(currentWindowIndex, index, mediaItems.size());
+    int currentMediaItemIndex = getCurrentMediaItemIndex();
+    int newCurrentMediaItemIndex =
+        calculateCurrentItemIndexAfterAddItems(currentMediaItemIndex, index, mediaItems.size());
     PlayerInfo maskedPlayerInfo =
-        controllerInfo.playerInfo.copyWithTimeline(newQueueTimeline, newCurrentWindowIndex);
+        controllerInfo.playerInfo.copyWithTimeline(newQueueTimeline, newCurrentMediaItemIndex);
     ControllerInfo maskedControllerInfo =
         new ControllerInfo(
             maskedPlayerInfo,
@@ -780,21 +781,21 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
     QueueTimeline queueTimeline = (QueueTimeline) controllerInfo.playerInfo.timeline;
     QueueTimeline newQueueTimeline = queueTimeline.copyWithRemovedMediaItems(fromIndex, toIndex);
-    int currentWindowIndex = getCurrentWindowIndex();
-    int newCurrentWindowIndex =
-        calculateCurrentItemIndexAfterRemoveItems(currentWindowIndex, fromIndex, toIndex);
-    if (newCurrentWindowIndex == C.INDEX_UNSET) {
-      newCurrentWindowIndex =
+    int currentMediaItemIndex = getCurrentMediaItemIndex();
+    int newCurrentMediaItemIndex =
+        calculateCurrentItemIndexAfterRemoveItems(currentMediaItemIndex, fromIndex, toIndex);
+    if (newCurrentMediaItemIndex == C.INDEX_UNSET) {
+      newCurrentMediaItemIndex =
           Util.constrainValue(fromIndex, /* min= */ 0, newQueueTimeline.getWindowCount() - 1);
       Log.w(
           TAG,
           "Currently playing item is removed. Assumes item at "
-              + newCurrentWindowIndex
+              + newCurrentMediaItemIndex
               + " is the"
               + " new current item");
     }
     PlayerInfo maskedPlayerInfo =
-        controllerInfo.playerInfo.copyWithTimeline(newQueueTimeline, newCurrentWindowIndex);
+        controllerInfo.playerInfo.copyWithTimeline(newQueueTimeline, newCurrentMediaItemIndex);
 
     ControllerInfo maskedControllerInfo =
         new ControllerInfo(
@@ -834,27 +835,27 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     int lastItemIndexAfterRemove = size - moveItemsSize - 1;
     newIndex = min(newIndex, lastItemIndexAfterRemove);
 
-    int currentWindowIndex = getCurrentWindowIndex();
-    int currentWindowIndexAfterRemove =
-        calculateCurrentItemIndexAfterRemoveItems(currentWindowIndex, fromIndex, toIndex);
-    if (currentWindowIndexAfterRemove == C.INDEX_UNSET) {
-      currentWindowIndexAfterRemove =
+    int currentMediaItemIndex = getCurrentMediaItemIndex();
+    int currentMediaItemIndexAfterRemove =
+        calculateCurrentItemIndexAfterRemoveItems(currentMediaItemIndex, fromIndex, toIndex);
+    if (currentMediaItemIndexAfterRemove == C.INDEX_UNSET) {
+      currentMediaItemIndexAfterRemove =
           Util.constrainValue(fromIndex, /* min= */ 0, /* toIndex= */ lastItemIndexAfterRemove);
       Log.w(
           TAG,
           "Currently playing item will be removed and added back to mimic move."
               + " Assumes item at "
-              + currentWindowIndexAfterRemove
+              + currentMediaItemIndexAfterRemove
               + " would be the new current item");
     }
-    int newCurrentWindowIndex =
+    int newCurrentMediaItemIndex =
         calculateCurrentItemIndexAfterAddItems(
-            currentWindowIndexAfterRemove, newIndex, moveItemsSize);
+            currentMediaItemIndexAfterRemove, newIndex, moveItemsSize);
 
     QueueTimeline newQueueTimeline =
         queueTimeline.copyWithMovedMediaItems(fromIndex, toIndex, newIndex);
     PlayerInfo maskedPlayerInfo =
-        controllerInfo.playerInfo.copyWithTimeline(newQueueTimeline, newCurrentWindowIndex);
+        controllerInfo.playerInfo.copyWithTimeline(newQueueTimeline, newCurrentMediaItemIndex);
 
     ControllerInfo maskedControllerInfo =
         new ControllerInfo(
@@ -880,55 +881,55 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 
   @Override
   public int getCurrentPeriodIndex() {
-    return getCurrentWindowIndex();
+    return getCurrentMediaItemIndex();
   }
 
   @Override
-  public int getCurrentWindowIndex() {
+  public int getCurrentMediaItemIndex() {
     return controllerInfo.playerInfo.sessionPositionInfo.positionInfo.mediaItemIndex;
   }
 
   @Override
-  public int getPreviousWindowIndex() {
+  public int getPreviousMediaItemIndex() {
     return C.INDEX_UNSET;
   }
 
   @Override
-  public int getNextWindowIndex() {
+  public int getNextMediaItemIndex() {
     return C.INDEX_UNSET;
   }
 
   @Override
-  public boolean hasPreviousWindow() {
+  public boolean hasPreviousMediaItem() {
     return connected;
   }
 
   @Override
-  public boolean hasNextWindow() {
+  public boolean hasNextMediaItem() {
     return connected;
   }
 
   @Override
-  public void seekToPreviousWindow() {
-    // Intentionally don't do state masking when current window index is uncertain.
+  public void seekToPreviousMediaItem() {
+    // Intentionally don't do state masking when current media item index is uncertain.
     controllerCompat.getTransportControls().skipToPrevious();
   }
 
   @Override
-  public void seekToNextWindow() {
-    // Intentionally don't do state masking when current window index is uncertain.
+  public void seekToNextMediaItem() {
+    // Intentionally don't do state masking when current media item index is uncertain.
     controllerCompat.getTransportControls().skipToNext();
   }
 
   @Override
   public void seekToPrevious() {
-    // Intentionally don't do state masking when current window index is uncertain.
+    // Intentionally don't do state masking when current media item index is uncertain.
     controllerCompat.getTransportControls().skipToPrevious();
   }
 
   @Override
   public void seekToNext() {
-    // Intentionally don't do state masking when current window index is uncertain.
+    // Intentionally don't do state masking when current media item index is uncertain.
     controllerCompat.getTransportControls().skipToNext();
   }
 
@@ -1712,9 +1713,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           currentMediaItemIndex = currentTimeline.getWindowCount() - 1;
         } else {
           currentTimeline = currentTimeline.copyWithFakeMediaItem(/* fakeMediaItem= */ null);
-          // Shouldn't be C.INDEX_UNSET to make getCurrentWindowIndex() return masked index.
-          // In other words, this index is either the currently playing window index or the would-be
-          // playing index when playing.
+          // Shouldn't be C.INDEX_UNSET to make getCurrentMediaItemIndex() return masked index.
+          // In other words, this index is either the currently playing media item index or the
+          // would-be playing index when playing.
           currentMediaItemIndex = 0;
         }
       } else if (currentMediaItemIndex != C.INDEX_UNSET) {
@@ -2044,13 +2045,13 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
   }
 
   private static PositionInfo createPositionInfo(
-      int windowIndex, @Nullable MediaItem mediaItem, long currentPositionMs) {
+      int mediaItemIndex, @Nullable MediaItem mediaItem, long currentPositionMs) {
     return new PositionInfo(
         /* windowUid= */ null,
-        /* windowIndex= */ windowIndex,
+        /* mediaItemIndex= */ mediaItemIndex,
         mediaItem,
         /* periodUid= */ null,
-        /* periodIndex= */ windowIndex,
+        /* periodIndex= */ mediaItemIndex,
         /* positionMs= */ currentPositionMs,
         /* contentPositionMs= */ currentPositionMs,
         /* adGroupIndex= */ C.INDEX_UNSET,

libraries/test_session_common/src/main/aidl/androidx/media3/test/session/common/IRemoteMediaController.aidl

@@ -34,9 +34,9 @@ interface IRemoteMediaController {
   void setPlayWhenReady(String controllerId, boolean playWhenReady);
   void prepare(String controllerId);
   void seekToDefaultPosition(String controllerId);
-  void seekToDefaultPositionWithWindowIndex(String controllerId, int windowIndex);
+  void seekToDefaultPositionWithMediaItemIndex(String controllerId, int mediaItemIndex);
   void seekTo(String controllerId, long positionMs);
-  void seekToWithWindowIndex(String controllerId, int windowIndex, long positionMs);
+  void seekToWithMediaItemIndex(String controllerId, int mediaItemIndex, long positionMs);
   void seekBack(String controllerId);
   void seekForward(String controllerId);
   void setPlaybackParameters(String controllerId, in Bundle playbackParametersBundle);
@@ -49,8 +49,8 @@ interface IRemoteMediaController {
   void setMediaItems(String controllerId, in List<Bundle> mediaItems);
   void setMediaItemsWithResetPosition(
       String controllerId, in List<Bundle> mediaItems, boolean resetPosition);
-  void setMediaItemsWithStartWindowIndex(
-      String controllerId, in List<Bundle> mediaItems, int startWindowIndex, long startPositionMs);
+  void setMediaItemsWithStartIndex(
+      String controllerId, in List<Bundle> mediaItems, int startIndex, long startPositionMs);
   void createAndSetFakeMediaItems(String controllerId, int size);
   void setMediaUri(String controllerId,  in Uri uri, in Bundle extras);
   void setPlaylistMetadata(String controllerId, in Bundle playlistMetadata);
@@ -63,8 +63,8 @@ interface IRemoteMediaController {
   void clearMediaItems(String controllerId);
   void moveMediaItem(String controllerId, int currentIndex, int newIndex);
   void moveMediaItems(String controllerId, int fromIndex, int toIndex, int newIndex);
-  void seekToPreviousWindow(String controllerId);
-  void seekToNextWindow(String controllerId);
+  void seekToPreviousMediaItem(String controllerId);
+  void seekToNextMediaItem(String controllerId);
   void seekToPrevious(String controllerId);
   void seekToNext(String controllerId);
   void setShuffleModeEnabled(String controllerId, boolean shuffleModeEnabled);

libraries/test_session_common/src/main/aidl/androidx/media3/test/session/common/IRemoteMediaSession.aidl

@@ -69,7 +69,7 @@ interface IRemoteMediaSession {
   void setPlaylistMetadata(String sessionId, in Bundle metadata);
   void setShuffleModeEnabled(String sessionId, boolean shuffleMode);
   void setRepeatMode(String sessionId, int repeatMode);
-  void setCurrentWindowIndex(String sessionId, int index);
+  void setCurrentMediaItemIndex(String sessionId, int index);
   void setTrackSelectionParameters(String sessionId, in Bundle parameters);
   void notifyTimelineChanged(String sessionId, int reason);
   void notifyPlaylistMetadataChanged(String sessionId);

libraries/test_session_common/src/main/java/androidx/media3/test/session/common/CommonConstants.java

@@ -68,7 +68,7 @@ public class CommonConstants {
   public static final String KEY_PLAYER_ERROR = "playerError";
   public static final String KEY_AUDIO_ATTRIBUTES = "audioAttributes";
   public static final String KEY_TIMELINE = "timeline";
-  public static final String KEY_CURRENT_WINDOW_INDEX = "currentWindowIndex";
+  public static final String KEY_CURRENT_MEDIA_ITEM_INDEX = "currentMediaItemIndex";
   public static final String KEY_CURRENT_PERIOD_INDEX = "currentPeriodIndex";
   public static final String KEY_DURATION = "duration";
   public static final String KEY_CURRENT_POSITION = "currentPosition";

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerCompatCallbackWithMediaSessionTest.java

@@ -126,7 +126,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
             .setPlaybackParameters(new PlaybackParameters(testSpeed))
             .setTimeline(testTimeline)
             .setPlaylistMetadata(testPlaylistMetadata)
-            .setCurrentWindowIndex(testItemIndex)
+            .setCurrentMediaItemIndex(testItemIndex)
             .setShuffleModeEnabled(testShuffleModeEnabled)
             .setRepeatMode(testRepeatMode)
             .build();
@@ -370,7 +370,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
             .setPlaybackParameters(playbackParameters)
             .setTimeline(testTimeline)
             .setPlaylistMetadata(testPlaylistMetadata)
-            .setCurrentWindowIndex(testItemIndex)
+            .setCurrentMediaItemIndex(testItemIndex)
             .setShuffleModeEnabled(testShuffleModeEnabled)
             .setRepeatMode(testRepeatMode)
             .build();
@@ -802,7 +802,7 @@ public class MediaControllerCompatCallbackWithMediaSessionTest {
         };
     controllerCompat.registerCallback(callback, handler);
 
-    session.getMockPlayer().setCurrentWindowIndex(testItemIndex);
+    session.getMockPlayer().setCurrentMediaItemIndex(testItemIndex);
     session.getMockPlayer().setCurrentPosition(testPosition);
     session
         .getMockPlayer()

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerListenerTest.java

@@ -455,7 +455,7 @@ public class MediaControllerListenerTest {
             .setIsPlayingAd(testIsPlayingAd)
             .setCurrentAdGroupIndex(testCurrentAdGroupIndex)
             .setCurrentAdIndexInAdGroup(testCurrentAdIndexInAdGroup)
-            .setCurrentWindowIndex(testWindowIndex)
+            .setCurrentMediaItemIndex(testWindowIndex)
             .setCurrentPeriodIndex(testPeriodIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
@@ -485,7 +485,7 @@ public class MediaControllerListenerTest {
     remoteSession
         .getMockPlayer()
         .notifyTimelineChanged(Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
-    remoteSession.getMockPlayer().setCurrentWindowIndex(currentIndex);
+    remoteSession.getMockPlayer().setCurrentMediaItemIndex(currentIndex);
     remoteSession
         .getMockPlayer()
         .notifyMediaItemTransition(
@@ -514,7 +514,7 @@ public class MediaControllerListenerTest {
                     }));
     int testIndex = 3;
     int testReason = Player.MEDIA_ITEM_TRANSITION_REASON_SEEK;
-    remoteSession.getMockPlayer().setCurrentWindowIndex(testIndex);
+    remoteSession.getMockPlayer().setCurrentMediaItemIndex(testIndex);
     remoteSession.getMockPlayer().notifyMediaItemTransition(testIndex, testReason);
     Timeline.Window window = new Timeline.Window();
     MediaItem currentMediaItem = timeline.getWindow(testIndex, window).mediaItem;
@@ -529,7 +529,7 @@ public class MediaControllerListenerTest {
   public void onMediaItemTransition_withNullMediaItem() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 1);
     remoteSession.getMockPlayer().setTimeline(timeline);
-    remoteSession.getMockPlayer().setCurrentWindowIndex(0);
+    remoteSession.getMockPlayer().setCurrentMediaItemIndex(0);
     remoteSession
         .getMockPlayer()
         .notifyMediaItemTransition(0, Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED);
@@ -820,7 +820,7 @@ public class MediaControllerListenerTest {
             /* shuffledIndices= */ new int[] {0, 2, 1});
     player.setTimeline(timeline);
     player.notifyTimelineChanged(Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
-    player.setCurrentWindowIndex(2);
+    player.setCurrentMediaItemIndex(2);
     player.setShuffleModeEnabled(false);
     player.notifyShuffleModeEnabledChanged();
 
@@ -860,7 +860,7 @@ public class MediaControllerListenerTest {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     player.setTimeline(timeline);
     player.notifyTimelineChanged(Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED);
-    player.setCurrentWindowIndex(2);
+    player.setCurrentMediaItemIndex(2);
     player.setRepeatMode(Player.REPEAT_MODE_OFF);
     player.notifyRepeatModeChanged();
 

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerStateMaskingTest.java

@@ -634,7 +634,7 @@ public class MediaControllerStateMaskingTest {
   }
 
   @Test
-  public void seekToNextWindow() throws Exception {
+  public void seekToNextMediaItem() throws Exception {
     int initialMediaItemIndex = 1;
     String firstMediaId = "firstMediaId";
     String secondMediaId = "secondMediaId";
@@ -647,7 +647,7 @@ public class MediaControllerStateMaskingTest {
             .setTimeline(
                 MediaTestUtils.createTimeline(
                     MediaTestUtils.createMediaItems(firstMediaId, secondMediaId, thirdMediaId)))
-            .setCurrentWindowIndex(initialMediaItemIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
@@ -681,13 +681,13 @@ public class MediaControllerStateMaskingTest {
           }
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
-              controller.seekToNextWindow();
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              controller.seekToNextMediaItem();
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
             });
 
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
@@ -696,11 +696,11 @@ public class MediaControllerStateMaskingTest {
     assertThat(newPositionInfoRef.get().mediaItemIndex).isEqualTo(testMediaItemIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_MEDIA_ITEM_TRANSITION)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_POSITION_DISCONTINUITY)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testMediaItemIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
   }
 
   @Test
-  public void seekToPreviousWindow() throws Exception {
+  public void seekToPreviousMediaItem() throws Exception {
     int initialMediaItemIndex = 1;
     String firstMediaId = "firstMediaId";
     String secondMediaId = "secondMediaId";
@@ -713,7 +713,7 @@ public class MediaControllerStateMaskingTest {
             .setTimeline(
                 MediaTestUtils.createTimeline(
                     MediaTestUtils.createMediaItems(firstMediaId, secondMediaId, thirdMediaId)))
-            .setCurrentWindowIndex(initialMediaItemIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
@@ -747,13 +747,13 @@ public class MediaControllerStateMaskingTest {
           }
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
-              controller.seekToPreviousWindow();
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              controller.seekToPreviousMediaItem();
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
             });
 
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
@@ -762,7 +762,7 @@ public class MediaControllerStateMaskingTest {
     assertThat(newPositionInfoRef.get().mediaItemIndex).isEqualTo(testMediaItemIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_MEDIA_ITEM_TRANSITION)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_POSITION_DISCONTINUITY)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testMediaItemIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
   }
 
   @Test
@@ -770,19 +770,19 @@ public class MediaControllerStateMaskingTest {
     long initialPosition = 8_000;
     long initialBufferedPosition = 9_200;
     long initialTotalBufferedDuration = 1_200;
-    int testWindowIndex = 0;
+    int testMediaItemIndex = 0;
     long testPosition = 9_000;
     long testBufferedPosition = initialBufferedPosition;
     long testTotalBufferedDuration = 200;
     Timeline testTimeline = createTimeline(1);
     MediaItem testCurrentMediaItem =
-        testTimeline.getWindow(testWindowIndex, new Window()).mediaItem;
+        testTimeline.getWindow(testMediaItemIndex, new Window()).mediaItem;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(testTimeline)
-            .setCurrentWindowIndex(testWindowIndex)
-            .setCurrentPeriodIndex(testWindowIndex)
+            .setCurrentMediaItemIndex(testMediaItemIndex)
+            .setCurrentPeriodIndex(testMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .setBufferedPosition(initialBufferedPosition)
@@ -839,19 +839,19 @@ public class MediaControllerStateMaskingTest {
     long initialPosition = 8_000;
     long initialBufferedPosition = 9_200;
     long initialTotalBufferedDuration = 1_200;
-    int testWindowIndex = 0;
+    int testMediaItemIndex = 0;
     long testPosition = 9_200;
     long testBufferedPosition = initialBufferedPosition;
     long testTotalBufferedDuration = 0;
     Timeline testTimeline = createTimeline(3);
     MediaItem testCurrentMediaItem =
-        testTimeline.getWindow(testWindowIndex, new Window()).mediaItem;
+        testTimeline.getWindow(testMediaItemIndex, new Window()).mediaItem;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(testTimeline)
-            .setCurrentWindowIndex(testWindowIndex)
-            .setCurrentPeriodIndex(testWindowIndex)
+            .setCurrentMediaItemIndex(testMediaItemIndex)
+            .setCurrentPeriodIndex(testMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .setBufferedPosition(initialBufferedPosition)
@@ -908,19 +908,19 @@ public class MediaControllerStateMaskingTest {
     long initialPosition = 8_000;
     long initialBufferedPosition = 9_200;
     long initialTotalBufferedDuration = 1_200;
-    int testWindowIndex = 0;
+    int testMediaItemIndex = 0;
     long testPosition = 1_000;
     long testBufferedPosition = 1_000;
     long testTotalBufferedDuration = 0;
     Timeline testTimeline = createTimeline(1);
     MediaItem testCurrentMediaItem =
-        testTimeline.getWindow(testWindowIndex, new Window()).mediaItem;
+        testTimeline.getWindow(testMediaItemIndex, new Window()).mediaItem;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(testTimeline)
-            .setCurrentWindowIndex(testWindowIndex)
-            .setCurrentPeriodIndex(testWindowIndex)
+            .setCurrentMediaItemIndex(testMediaItemIndex)
+            .setCurrentPeriodIndex(testMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .setBufferedPosition(initialBufferedPosition)
@@ -975,7 +975,7 @@ public class MediaControllerStateMaskingTest {
   @Test
   public void seekTo_toDifferentPeriodInSameWindow() throws Exception {
     long defaultPeriodDuration = 10_000;
-    int initialWindowIndex = 0;
+    int initialMediaItemIndex = 0;
     int initialPeriodIndex = 0;
     long initialPosition = 8_000;
     long initialBufferedPosition = 9_200;
@@ -989,7 +989,7 @@ public class MediaControllerStateMaskingTest {
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(
                 MediaTestUtils.createTimelineWithPeriodSizes(new int[] {3}, defaultPeriodDuration))
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialPeriodIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
@@ -1046,7 +1046,7 @@ public class MediaControllerStateMaskingTest {
   public void seekTo_toDifferentPeriodInSameWindow_doesNotCallOnMediaItemTransition()
       throws Exception {
     long defaultPeriodDuration = 10_000;
-    int initialWindowIndex = 0;
+    int initialMediaItemIndex = 0;
     int initialPeriodIndex = 0;
     long initialPosition = 8_000;
     long testPosition = 16_000;
@@ -1055,7 +1055,7 @@ public class MediaControllerStateMaskingTest {
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(
                 MediaTestUtils.createTimelineWithPeriodSizes(new int[] {3}, defaultPeriodDuration))
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialPeriodIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
@@ -1079,24 +1079,24 @@ public class MediaControllerStateMaskingTest {
 
   @Test
   public void seekTo_toDifferentPeriodInDifferentWindow() throws Exception {
-    int initialWindowIndex = 2;
+    int initialMediaItemIndex = 2;
     long initialPosition = 8_000;
     long initialBufferedPosition = 9_200;
     long initialTotalBufferedDuration = 1_200;
-    int testWindowIndex = 0;
+    int testMediaItemIndex = 0;
     int testPeriodIndex = 0;
     long testPosition = 1_000;
     long testBufferedPosition = 1_000;
     long testTotalBufferedDuration = 0;
     Timeline testTimeline = createTimeline(3);
     MediaItem testCurrentMediaItem =
-        testTimeline.getWindow(testWindowIndex, new Window()).mediaItem;
+        testTimeline.getWindow(testMediaItemIndex, new Window()).mediaItem;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(testTimeline)
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .setBufferedPosition(initialBufferedPosition)
@@ -1124,7 +1124,7 @@ public class MediaControllerStateMaskingTest {
           }
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     AtomicLong currentPositionRef = new AtomicLong();
     AtomicLong bufferedPositionRef = new AtomicLong();
@@ -1134,8 +1134,8 @@ public class MediaControllerStateMaskingTest {
         .getHandler()
         .postAndSync(
             () -> {
-              controller.seekTo(testWindowIndex, testPosition);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              controller.seekTo(testMediaItemIndex, testPosition);
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
               currentPositionRef.set(controller.getCurrentPosition());
               bufferedPositionRef.set(controller.getBufferedPosition());
@@ -1146,7 +1146,7 @@ public class MediaControllerStateMaskingTest {
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
     assertThat(newPositionInfoRef.get().positionMs).isEqualTo(testPosition);
     assertThat(onEventsRef.get().contains(Player.EVENT_POSITION_DISCONTINUITY)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testPeriodIndex);
     assertThat(currentPositionRef.get()).isEqualTo(testPosition);
     assertThat(bufferedPositionRef.get()).isEqualTo(testBufferedPosition);
@@ -1156,13 +1156,13 @@ public class MediaControllerStateMaskingTest {
 
   @Test
   public void seekTo_whilePlayingAd_ignored() throws Exception {
-    int initialWindowIndex = 0;
+    int initialMediaItemIndex = 0;
     int initialPosition = 0;
     int seekPosition = 3_000;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .setIsPlayingAd(/* isPlayingAd= */ true)
@@ -1170,59 +1170,59 @@ public class MediaControllerStateMaskingTest {
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPositionRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.seekTo(seekPosition);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPositionRef.set((int) controller.getCurrentPosition());
             });
 
-    assertThat(currentWindowIndexRef.get()).isEqualTo(initialWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(initialMediaItemIndex);
     assertThat(currentPositionRef.get()).isEqualTo(initialPosition);
   }
 
   @Test
   public void seekTo_samePosition_ignored() throws Exception {
-    int initialWindowIndex = 0;
+    int initialMediaItemIndex = 0;
     int initialPosition = 3_000;
     int seekPosition = 3_000;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPositionRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.seekTo(seekPosition);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPositionRef.set((int) controller.getCurrentPosition());
             });
 
-    assertThat(currentWindowIndexRef.get()).isEqualTo(initialWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(initialMediaItemIndex);
     assertThat(currentPositionRef.get()).isEqualTo(initialPosition);
   }
 
   @Test
   public void seekTo_withEmptyTimeline() throws Exception {
-    int initialWindowIndex = 0;
+    int initialMediaItemIndex = 0;
     int initialPeriodIndex = 0;
     int initialPosition = 0;
     int initialBufferedPosition = 0;
     int initialTotalBufferedPosition = 0;
-    int testWindowIndex = 3;
+    int testMediaItemIndex = 3;
     int testPeriodIndex = initialPeriodIndex;
     long testSeekPositionMs = 3_000;
     long testPosition = testSeekPositionMs;
@@ -1231,7 +1231,7 @@ public class MediaControllerStateMaskingTest {
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialPeriodIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
@@ -1261,7 +1261,7 @@ public class MediaControllerStateMaskingTest {
           }
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     AtomicInteger currentPositionRef = new AtomicInteger();
     AtomicInteger bufferedPositionRef = new AtomicInteger();
@@ -1270,8 +1270,8 @@ public class MediaControllerStateMaskingTest {
         .getHandler()
         .postAndSync(
             () -> {
-              controller.seekTo(testWindowIndex, testSeekPositionMs);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              controller.seekTo(testMediaItemIndex, testSeekPositionMs);
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
               currentPositionRef.set((int) controller.getCurrentPosition());
               bufferedPositionRef.set((int) controller.getBufferedPosition());
@@ -1281,7 +1281,7 @@ public class MediaControllerStateMaskingTest {
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
     assertThat(newPositionInfoRef.get().positionMs).isEqualTo(testSeekPositionMs);
     assertThat(onEventsRef.get().contains(Player.EVENT_POSITION_DISCONTINUITY)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testPeriodIndex);
     assertThat(currentPositionRef.get()).isEqualTo(testPosition);
     assertThat(bufferedPositionRef.get()).isEqualTo(testBufferedPosition);
@@ -1383,12 +1383,12 @@ public class MediaControllerStateMaskingTest {
 
   @Test
   public void setMediaItems_withResetPosition() throws Exception {
-    int initialWindowIndex = 2;
+    int initialMediaItemIndex = 2;
     long initialPosition = 8_000;
     long initialBufferedPosition = 9_200;
     long initialTotalBufferedDuration = 1_200;
     int testMediaItemCount = 2;
-    int testWindowIndex = 0;
+    int testMediaItemIndex = 0;
     int testPeriodIndex = 0;
     long testPosition = 0;
     long testBufferedPosition = 0;
@@ -1397,8 +1397,8 @@ public class MediaControllerStateMaskingTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(MediaTestUtils.createTimeline(3))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .setBufferedPosition(initialBufferedPosition)
@@ -1434,7 +1434,7 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicLong currentPositionRef = new AtomicLong();
     AtomicLong bufferedPositionRef = new AtomicLong();
     AtomicLong totalBufferedDurationRef = new AtomicLong();
@@ -1445,7 +1445,7 @@ public class MediaControllerStateMaskingTest {
             () -> {
               controller.setMediaItems(
                   createMediaItems(testMediaItemCount), /* resetPosition= */ true);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPositionRef.set((int) controller.getCurrentPosition());
               bufferedPositionRef.set((int) controller.getBufferedPosition());
               totalBufferedDurationRef.set((int) controller.getTotalBufferedDuration());
@@ -1457,11 +1457,11 @@ public class MediaControllerStateMaskingTest {
     assertTimeline(
         newTimelineRef.get(),
         testMediaItemCount,
-        testWindowIndex,
+        testMediaItemIndex,
         /* testFirstPeriodIndex= */ testPeriodIndex,
         /* testLastPeriodIndex= */ testPeriodIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_POSITION_DISCONTINUITY)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testPeriodIndex);
     assertThat(currentPositionRef.get()).isEqualTo(testPosition);
     assertThat(bufferedPositionRef.get()).isEqualTo(testBufferedPosition);
@@ -1469,15 +1469,15 @@ public class MediaControllerStateMaskingTest {
   }
 
   @Test
-  public void setMediaItems_withStartWindowIndexAndStartPosition() throws Exception {
-    int initialWindowIndex = 2;
+  public void setMediaItems_withStartMediaItemIndexAndStartPosition() throws Exception {
+    int initialMediaItemIndex = 2;
     long initialPosition = 8_000;
     long initialBufferedPosition = 9_200;
     long initialTotalBufferedDuration = 1_200;
     String dummyMediaId = "dummyMediaId";
-    String testWindowIndexMediaId = "testWindowIndexMediaId";
+    String testMediaItemIndexMediaId = "testMediaItemIndexMediaId";
     int testMediaItemCount = 2;
-    int testWindowIndex = 1;
+    int testMediaItemIndex = 1;
     int testPeriodIndex = 1;
     long testPosition = 1_000;
     long testBufferedPosition = 1_000;
@@ -1486,8 +1486,8 @@ public class MediaControllerStateMaskingTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(MediaTestUtils.createTimeline(3))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .setBufferedPosition(initialBufferedPosition)
@@ -1530,7 +1530,7 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     AtomicLong currentPositionRef = new AtomicLong();
     AtomicLong bufferedPositionRef = new AtomicLong();
@@ -1540,10 +1540,10 @@ public class MediaControllerStateMaskingTest {
         .postAndSync(
             () -> {
               controller.setMediaItems(
-                  createMediaItems(dummyMediaId, testWindowIndexMediaId),
-                  /* startWindowIndex= */ testWindowIndex,
+                  createMediaItems(dummyMediaId, testMediaItemIndexMediaId),
+                  /* startMediaItemIndex= */ testMediaItemIndex,
                   /* startPositionMs= */ testPosition);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
               currentPositionRef.set((int) controller.getCurrentPosition());
               bufferedPositionRef.set((int) controller.getBufferedPosition());
@@ -1555,14 +1555,14 @@ public class MediaControllerStateMaskingTest {
     assertTimeline(
         newTimelineRef.get(),
         testMediaItemCount,
-        testWindowIndex,
+        testMediaItemIndex,
         /* testFirstPeriodIndex= */ testPeriodIndex,
         /* testLastPeriodIndex= */ testPeriodIndex);
-    assertThat(newMediaItemRef.get().mediaId).isEqualTo(testWindowIndexMediaId);
+    assertThat(newMediaItemRef.get().mediaId).isEqualTo(testMediaItemIndexMediaId);
     assertThat(onEventsRef.get().contains(Player.EVENT_POSITION_DISCONTINUITY)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_MEDIA_ITEM_TRANSITION)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testPeriodIndex);
     assertThat(currentPositionRef.get()).isEqualTo(testPosition);
     assertThat(bufferedPositionRef.get()).isEqualTo(testBufferedPosition);
@@ -1571,12 +1571,12 @@ public class MediaControllerStateMaskingTest {
 
   @Test
   public void setMediaItems_withEmptyList() throws Exception {
-    int initialWindowIndex = 2;
+    int initialMediaItemIndex = 2;
     long initialPosition = 8_000;
     long initialBufferedPosition = 9_200;
     long initialTotalBufferedDuration = 1_200;
     List<MediaItem> testMediaItemList = new ArrayList<>();
-    int testWindowIndex = 1;
+    int testMediaItemIndex = 1;
     int testPeriodIndex = 0;
     long testPosition = 1_000;
     long testBufferedPosition = 1_000;
@@ -1585,8 +1585,8 @@ public class MediaControllerStateMaskingTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(MediaTestUtils.createTimeline(3))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .setCurrentPosition(initialPosition)
             .setContentPosition(initialPosition)
             .setBufferedPosition(initialBufferedPosition)
@@ -1629,7 +1629,7 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     AtomicLong currentPositionRef = new AtomicLong();
     AtomicLong bufferedPositionRef = new AtomicLong();
@@ -1640,9 +1640,9 @@ public class MediaControllerStateMaskingTest {
             () -> {
               controller.setMediaItems(
                   testMediaItemList,
-                  /* startWindowIndex= */ testWindowIndex,
+                  /* startMediaItemIndex= */ testMediaItemIndex,
                   /* startPositionMs= */ testPosition);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
               currentPositionRef.set((int) controller.getCurrentPosition());
               bufferedPositionRef.set((int) controller.getBufferedPosition());
@@ -1656,7 +1656,7 @@ public class MediaControllerStateMaskingTest {
     assertThat(onEventsRef.get().contains(Player.EVENT_POSITION_DISCONTINUITY)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_MEDIA_ITEM_TRANSITION)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testPeriodIndex);
     assertThat(currentPositionRef.get()).isEqualTo(testPosition);
     assertThat(bufferedPositionRef.get()).isEqualTo(testBufferedPosition);
@@ -1690,9 +1690,9 @@ public class MediaControllerStateMaskingTest {
   @Test
   public void addMediaItems_toEmptyTimeline() throws Exception {
     int testMediaItemCount = 2;
-    int testCurrentWindowIndex = 0;
-    int testNextWindowIndex = 1;
-    int testPreviousWindowIndex = C.INDEX_UNSET;
+    int testCurrentMediaItemIndex = 0;
+    int testNextMediaItemIndex = 1;
+    int testPreviousMediaItemIndex = C.INDEX_UNSET;
     int testCurrentPeriodIndex = 0;
     List<MediaItem> testMediaItems = createMediaItems(testMediaItemCount);
     MediaItem testMediaItem = testMediaItems.get(testCurrentPeriodIndex);
@@ -1727,18 +1727,18 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
-    AtomicInteger nextWindowIndexRef = new AtomicInteger();
-    AtomicInteger previousWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger nextMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger previousMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.addMediaItems(testMediaItems);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
-              nextWindowIndexRef.set(controller.getNextWindowIndex());
-              previousWindowIndexRef.set(controller.getPreviousWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
+              nextMediaItemIndexRef.set(controller.getNextMediaItemIndex());
+              previousMediaItemIndexRef.set(controller.getPreviousMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
             });
 
@@ -1746,13 +1746,13 @@ public class MediaControllerStateMaskingTest {
     assertTimeline(
         newTimelineRef.get(),
         testMediaItemCount,
-        testCurrentWindowIndex,
+        testCurrentMediaItemIndex,
         /* testFirstPeriodIndex= */ testCurrentPeriodIndex,
         /* testLastPeriodIndex= */ testCurrentPeriodIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
-    assertThat(nextWindowIndexRef.get()).isEqualTo(testNextWindowIndex);
-    assertThat(previousWindowIndexRef.get()).isEqualTo(testPreviousWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
+    assertThat(nextMediaItemIndexRef.get()).isEqualTo(testNextMediaItemIndex);
+    assertThat(previousMediaItemIndexRef.get()).isEqualTo(testPreviousMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testCurrentPeriodIndex);
     assertThat(newMediaItemRef.get()).isEqualTo(testMediaItem);
   }
@@ -1760,18 +1760,18 @@ public class MediaControllerStateMaskingTest {
   @Test
   public void addMediaItems_toEndOfTimeline() throws Exception {
     int initialMediaItemCount = 3;
-    int initialWindowIndex = 2;
+    int initialMediaItemIndex = 2;
     int testMediaItemCount = 2;
-    int testCurrentWindowIndex = initialWindowIndex;
-    int testNextWindowIndex = testCurrentWindowIndex + 1;
-    int testPreviousWindowIndex = testCurrentWindowIndex - 1;
-    int testCurrentPeriodIndex = initialWindowIndex;
+    int testCurrentMediaItemIndex = initialMediaItemIndex;
+    int testNextMediaItemIndex = testCurrentMediaItemIndex + 1;
+    int testPreviousMediaItemIndex = testCurrentMediaItemIndex - 1;
+    int testCurrentPeriodIndex = initialMediaItemIndex;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(MediaTestUtils.createTimeline(initialMediaItemCount))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
 
@@ -1795,18 +1795,18 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
-    AtomicInteger nextWindowIndexRef = new AtomicInteger();
-    AtomicInteger previousWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger nextMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger previousMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.addMediaItems(createMediaItems(testMediaItemCount));
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
-              nextWindowIndexRef.set(controller.getNextWindowIndex());
-              previousWindowIndexRef.set(controller.getPreviousWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
+              nextMediaItemIndexRef.set(controller.getNextMediaItemIndex());
+              previousMediaItemIndexRef.set(controller.getPreviousMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
             });
 
@@ -1814,33 +1814,33 @@ public class MediaControllerStateMaskingTest {
     assertTimeline(
         newTimelineRef.get(),
         initialMediaItemCount + testMediaItemCount,
-        testCurrentWindowIndex,
+        testCurrentMediaItemIndex,
         /* testFirstPeriodIndex= */ testCurrentPeriodIndex,
         /* testLastPeriodIndex= */ testCurrentPeriodIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
-    assertThat(nextWindowIndexRef.get()).isEqualTo(testNextWindowIndex);
-    assertThat(previousWindowIndexRef.get()).isEqualTo(testPreviousWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
+    assertThat(nextMediaItemIndexRef.get()).isEqualTo(testNextMediaItemIndex);
+    assertThat(previousMediaItemIndexRef.get()).isEqualTo(testPreviousMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testCurrentPeriodIndex);
   }
 
   @Test
   public void addMediaItems_toTimelineWithSinglePeriodPerWindow() throws Exception {
     int initialMediaItemCount = 3;
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     int initialPeriodIndex = 1;
     int testMediaItemCount = 2;
 
     assertAddMediaItems(
         initialMediaItemCount,
-        initialWindowIndex,
+        initialMediaItemIndex,
         initialPeriodIndex,
         /* initialTimeline= */ MediaTestUtils.createTimelineWithPeriodSizes(new int[] {1, 1, 1}),
         testMediaItemCount,
         /* testIndex= */ 1,
-        /* testCurrentWindowIndex= */ initialWindowIndex + testMediaItemCount,
-        /* testNextWindowIndex= */ initialWindowIndex + testMediaItemCount + 1,
-        /* testPreviousWindowIndex= */ initialWindowIndex + testMediaItemCount - 1,
+        /* testCurrentMediaItemIndex= */ initialMediaItemIndex + testMediaItemCount,
+        /* testNextMediaItemIndex= */ initialMediaItemIndex + testMediaItemCount + 1,
+        /* testPreviousMediaItemIndex= */ initialMediaItemIndex + testMediaItemCount - 1,
         /* testCurrentPeriodIndex= */ initialPeriodIndex + testMediaItemCount,
         /* testCurrentWindowFirstPeriodIndex= */ initialPeriodIndex + testMediaItemCount,
         /* testCurrentWindowLastPeriodIndex= */ initialPeriodIndex + testMediaItemCount);
@@ -1849,7 +1849,7 @@ public class MediaControllerStateMaskingTest {
   @Test
   public void addMediaItems_toTimelineWithMultiplePeriodsPerWindow() throws Exception {
     int initialMediaItemCount = 3;
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     int initialWindowFirstPeriodIndex = 2;
     int initialWindowLastPeriodIndex = 4;
     int initialPeriodIndex = 3;
@@ -1857,14 +1857,14 @@ public class MediaControllerStateMaskingTest {
 
     assertAddMediaItems(
         initialMediaItemCount,
-        initialWindowIndex,
+        initialMediaItemIndex,
         initialPeriodIndex,
         /* initialTimeline= */ MediaTestUtils.createTimelineWithPeriodSizes(new int[] {2, 3, 2}),
         testMediaItemCount,
         /* testIndex= */ 1,
-        /* testCurrentWindowIndex= */ initialWindowIndex + testMediaItemCount,
-        /* testNextWindowIndex= */ initialWindowIndex + testMediaItemCount + 1,
-        /* testPreviousWindowIndex= */ initialWindowIndex + testMediaItemCount - 1,
+        /* testCurrentMediaItemIndex= */ initialMediaItemIndex + testMediaItemCount,
+        /* testNextMediaItemIndex= */ initialMediaItemIndex + testMediaItemCount + 1,
+        /* testPreviousMediaItemIndex= */ initialMediaItemIndex + testMediaItemCount - 1,
         /* testCurrentPeriodIndex= */ initialPeriodIndex + testMediaItemCount,
         /* testCurrentWindowFirstPeriodIndex= */ initialWindowFirstPeriodIndex + testMediaItemCount,
         /* testCurrentWindowLastPeriodIndex= */ initialWindowLastPeriodIndex + testMediaItemCount);
@@ -1872,14 +1872,14 @@ public class MediaControllerStateMaskingTest {
 
   private void assertAddMediaItems(
       int initialMediaItemCount,
-      int initialWindowIndex,
+      int initialMediaItemIndex,
       int initialPeriodIndex,
       Timeline initialTimeline,
       int testMediaItemCount,
       int testIndex,
-      int testCurrentWindowIndex,
-      int testNextWindowIndex,
-      int testPreviousWindowIndex,
+      int testCurrentMediaItemIndex,
+      int testNextMediaItemIndex,
+      int testPreviousMediaItemIndex,
       int testCurrentPeriodIndex,
       int testCurrentWindowFirstPeriodIndex,
       int testCurrentWindowLastPeriodIndex)
@@ -1887,7 +1887,7 @@ public class MediaControllerStateMaskingTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(initialTimeline)
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialPeriodIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
@@ -1912,9 +1912,9 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
-    AtomicInteger nextWindowIndexRef = new AtomicInteger();
-    AtomicInteger previousWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger nextMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger previousMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
@@ -1922,9 +1922,9 @@ public class MediaControllerStateMaskingTest {
             () -> {
               controller.addMediaItems(
                   /* index= */ testIndex, createMediaItems(testMediaItemCount));
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
-              nextWindowIndexRef.set(controller.getNextWindowIndex());
-              previousWindowIndexRef.set(controller.getPreviousWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
+              nextMediaItemIndexRef.set(controller.getNextMediaItemIndex());
+              previousMediaItemIndexRef.set(controller.getPreviousMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
             });
 
@@ -1932,19 +1932,19 @@ public class MediaControllerStateMaskingTest {
     assertTimeline(
         newTimelineRef.get(),
         initialMediaItemCount + testMediaItemCount,
-        testCurrentWindowIndex,
+        testCurrentMediaItemIndex,
         /* testFirstPeriodIndex= */ testCurrentWindowFirstPeriodIndex,
         /* testLastPeriodIndex= */ testCurrentWindowLastPeriodIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
-    assertThat(nextWindowIndexRef.get()).isEqualTo(testNextWindowIndex);
-    assertThat(previousWindowIndexRef.get()).isEqualTo(testPreviousWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
+    assertThat(nextMediaItemIndexRef.get()).isEqualTo(testNextMediaItemIndex);
+    assertThat(previousMediaItemIndexRef.get()).isEqualTo(testPreviousMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testCurrentPeriodIndex);
   }
 
   @Test
   public void removeMediaItems_currentItemRemoved() throws Exception {
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     String firstMediaId = "firstMediaId";
     String secondMediaId = "secondMediaId";
     String thirdMediaId = "thirdMediaId";
@@ -1953,16 +1953,16 @@ public class MediaControllerStateMaskingTest {
     int testToIndex = 2;
     int testMediaItemCount = 2;
     int testCurrentMediaItemIndex = testFromIndex;
-    int testNextWindowIndex = C.INDEX_UNSET;
-    int testPreviousWindowIndex = testCurrentMediaItemIndex - 1;
+    int testNextMediaItemIndex = C.INDEX_UNSET;
+    int testPreviousMediaItemIndex = testCurrentMediaItemIndex - 1;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(
                 MediaTestUtils.createTimeline(
                     createMediaItems(firstMediaId, secondMediaId, thirdMediaId)))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
 
@@ -2001,18 +2001,18 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
-    AtomicInteger nextWindowIndexRef = new AtomicInteger();
-    AtomicInteger previousWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger nextMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger previousMediaItemIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.removeMediaItems(
                   /* fromIndex= */ testFromIndex, /* toIndex= */ testToIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
-              nextWindowIndexRef.set(controller.getNextWindowIndex());
-              previousWindowIndexRef.set(controller.getPreviousWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
+              nextMediaItemIndexRef.set(controller.getNextMediaItemIndex());
+              previousMediaItemIndexRef.set(controller.getPreviousMediaItemIndex());
             });
 
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
@@ -2026,14 +2026,14 @@ public class MediaControllerStateMaskingTest {
     assertThat(newPositionInfoRef.get().mediaItemIndex).isEqualTo(testCurrentMediaItemIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_MEDIA_ITEM_TRANSITION)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
-    assertThat(nextWindowIndexRef.get()).isEqualTo(testNextWindowIndex);
-    assertThat(previousWindowIndexRef.get()).isEqualTo(testPreviousWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
+    assertThat(nextMediaItemIndexRef.get()).isEqualTo(testNextMediaItemIndex);
+    assertThat(previousMediaItemIndexRef.get()).isEqualTo(testPreviousMediaItemIndex);
   }
 
   @Test
   public void removeMediaItems_currentItemNotRemoved() throws Exception {
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     String firstMediaId = "firstMediaId";
     String secondMediaId = "secondMediaId";
     String thirdMediaId = "thirdMediaId";
@@ -2041,17 +2041,17 @@ public class MediaControllerStateMaskingTest {
     int testFromIndex = 2;
     int testToIndex = 3;
     int testMediaItemCount = 2;
-    int testCurrentWindowIndex = initialWindowIndex;
-    int testNextWindowIndex = C.INDEX_UNSET;
-    int testPreviousWindowIndex = testCurrentWindowIndex - 1;
+    int testCurrentMediaItemIndex = initialMediaItemIndex;
+    int testNextMediaItemIndex = C.INDEX_UNSET;
+    int testPreviousMediaItemIndex = testCurrentMediaItemIndex - 1;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(
                 MediaTestUtils.createTimeline(
                     createMediaItems(firstMediaId, secondMediaId, thirdMediaId)))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
 
@@ -2075,39 +2075,39 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
-    AtomicInteger nextWindowIndexRef = new AtomicInteger();
-    AtomicInteger previousWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger nextMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger previousMediaItemIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.removeMediaItems(
                   /* fromIndex= */ testFromIndex, /* toIndex= */ testToIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
-              nextWindowIndexRef.set(controller.getNextWindowIndex());
-              previousWindowIndexRef.set(controller.getPreviousWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
+              nextMediaItemIndexRef.set(controller.getNextMediaItemIndex());
+              previousMediaItemIndexRef.set(controller.getPreviousMediaItemIndex());
             });
 
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
     assertTimeline(
         newTimelineRef.get(),
         testMediaItemCount,
-        testCurrentWindowIndex,
-        /* testFirstPeriodIndex= */ testCurrentWindowIndex,
-        /* testLastPeriodIndex= */ testCurrentWindowIndex);
+        testCurrentMediaItemIndex,
+        /* testFirstPeriodIndex= */ testCurrentMediaItemIndex,
+        /* testLastPeriodIndex= */ testCurrentMediaItemIndex);
     Window window = new Window();
-    assertThat(newTimelineRef.get().getWindow(testCurrentWindowIndex, window).mediaItem.mediaId)
+    assertThat(newTimelineRef.get().getWindow(testCurrentMediaItemIndex, window).mediaItem.mediaId)
         .isEqualTo(testCurrentMediaId);
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
-    assertThat(nextWindowIndexRef.get()).isEqualTo(testNextWindowIndex);
-    assertThat(previousWindowIndexRef.get()).isEqualTo(testPreviousWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
+    assertThat(nextMediaItemIndexRef.get()).isEqualTo(testNextMediaItemIndex);
+    assertThat(previousMediaItemIndexRef.get()).isEqualTo(testPreviousMediaItemIndex);
   }
 
   @Test
   public void removeMediaItems_removePreviousItemWithMultiplePeriods() throws Exception {
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     int initialWindowFirstPeriodIndex = 2;
     int initialWindowLastPeriodIndex = 4;
     int initialPeriodIndex = 3;
@@ -2115,7 +2115,7 @@ public class MediaControllerStateMaskingTest {
     int testToIndex = 1;
     int testMediaItemCount = 2;
     int prevWindowPeriodSize = 2;
-    int testCurrentWindowIndex = 0;
+    int testCurrentMediaItemIndex = 0;
     int testCurrentPeriodIndex = initialPeriodIndex - prevWindowPeriodSize;
     int testCurrentWindowFirstPeriodIndex = initialWindowFirstPeriodIndex - prevWindowPeriodSize;
     int testCurrentWindowLastPeriodIndex = initialWindowLastPeriodIndex - prevWindowPeriodSize;
@@ -2125,7 +2125,7 @@ public class MediaControllerStateMaskingTest {
             .setTimeline(
                 MediaTestUtils.createTimelineWithPeriodSizes(
                     new int[] {prevWindowPeriodSize, 3, 2}))
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialPeriodIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
@@ -2150,7 +2150,7 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
@@ -2158,7 +2158,7 @@ public class MediaControllerStateMaskingTest {
             () -> {
               controller.removeMediaItems(
                   /* fromIndex= */ testFromIndex, /* toIndex= */ testToIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
             });
 
@@ -2166,17 +2166,17 @@ public class MediaControllerStateMaskingTest {
     assertTimeline(
         newTimelineRef.get(),
         testMediaItemCount,
-        testCurrentWindowIndex,
+        testCurrentMediaItemIndex,
         /* testFirstPeriodIndex= */ testCurrentWindowFirstPeriodIndex,
         /* testLastPeriodIndex= */ testCurrentWindowLastPeriodIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testCurrentPeriodIndex);
   }
 
   @Test
   public void removeMediaItems_removeAllItems() throws Exception {
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     int initialPlaybackState = STATE_READY;
     long initialCurrentPosition = 3_000;
     String firstMediaId = "firstMediaId";
@@ -2185,9 +2185,9 @@ public class MediaControllerStateMaskingTest {
     int testFromIndex = 0;
     int testToIndex = 3;
     int testMediaItemCount = 0;
-    int testCurrentWindowIndex = 0;
-    int testNextWindowIndex = C.INDEX_UNSET;
-    int testPreviousWindowIndex = C.INDEX_UNSET;
+    int testCurrentMediaItemIndex = 0;
+    int testNextMediaItemIndex = C.INDEX_UNSET;
+    int testPreviousMediaItemIndex = C.INDEX_UNSET;
     int testPlaybackState = STATE_ENDED;
     long testCurrentPosition = 0;
 
@@ -2196,8 +2196,8 @@ public class MediaControllerStateMaskingTest {
             .setTimeline(
                 MediaTestUtils.createTimeline(
                     createMediaItems(firstMediaId, secondMediaId, thirdMediaId)))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .setCurrentPosition(initialCurrentPosition)
             .setPlaybackState(initialPlaybackState)
             .build();
@@ -2237,9 +2237,9 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
-    AtomicInteger nextWindowIndexRef = new AtomicInteger();
-    AtomicInteger previousWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger nextMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger previousMediaItemIndexRef = new AtomicInteger();
     AtomicLong newCurrentPositionRef = new AtomicLong();
     threadTestRule
         .getHandler()
@@ -2247,9 +2247,9 @@ public class MediaControllerStateMaskingTest {
             () -> {
               controller.removeMediaItems(
                   /* fromIndex= */ testFromIndex, /* toIndex= */ testToIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
-              nextWindowIndexRef.set(controller.getNextWindowIndex());
-              previousWindowIndexRef.set(controller.getPreviousWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
+              nextMediaItemIndexRef.set(controller.getNextMediaItemIndex());
+              previousMediaItemIndexRef.set(controller.getPreviousMediaItemIndex());
               newCurrentPositionRef.set(controller.getCurrentPosition());
             });
 
@@ -2265,16 +2265,16 @@ public class MediaControllerStateMaskingTest {
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_MEDIA_ITEM_TRANSITION)).isTrue();
     assertThat(onEventsRef.get().contains(Player.EVENT_PLAYBACK_STATE_CHANGED)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
-    assertThat(nextWindowIndexRef.get()).isEqualTo(testNextWindowIndex);
-    assertThat(previousWindowIndexRef.get()).isEqualTo(testPreviousWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
+    assertThat(nextMediaItemIndexRef.get()).isEqualTo(testNextMediaItemIndex);
+    assertThat(previousMediaItemIndexRef.get()).isEqualTo(testPreviousMediaItemIndex);
     assertThat(newCurrentPositionRef.get()).isEqualTo(testCurrentPosition);
   }
 
   @Test
   public void removeMediaItems_removedTailIncludesCurrentItem_callsOnPlaybackStateChanged()
       throws Exception {
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     int initialPlaybackState = STATE_READY;
     int testFromIndex = 1;
     int testToIndex = 3;
@@ -2284,8 +2284,8 @@ public class MediaControllerStateMaskingTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(testTimeline)
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .setPlaybackState(initialPlaybackState)
             .build();
     remoteSession.setPlayer(playerConfig);
@@ -2327,10 +2327,10 @@ public class MediaControllerStateMaskingTest {
     // Remove from middle to end of the timeline.
     assertRemoveMediaItems(
         /* shuffleModeEnabled= */ false,
-        /* initialWindowIndex= */ 1,
+        /* initialMediaItemIndex= */ 1,
         /* testFromIndex= */ 1,
         /* testToIndex= */ 4,
-        /* testCurrentWindowIndex= */ 0,
+        /* testCurrentMediaItemIndex= */ 0,
         /* testCurrentPeriodIndex= */ 0,
         /* testTimeline= */ testTimeline,
         /* testMediaId= */ firstMediaId);
@@ -2338,10 +2338,10 @@ public class MediaControllerStateMaskingTest {
     // Remove middle of the timeline.
     assertRemoveMediaItems(
         /* shuffleModeEnabled= */ false,
-        /* initialWindowIndex= */ 2,
+        /* initialMediaItemIndex= */ 2,
         /* testFromIndex= */ 1,
         /* testToIndex= */ 3,
-        /* testCurrentWindowIndex= */ 1,
+        /* testCurrentMediaItemIndex= */ 1,
         /* testCurrentPeriodIndex= */ 1,
         /* testTimeline= */ testTimeline,
         /* testMediaId= */ fourthMediaId);
@@ -2359,10 +2359,10 @@ public class MediaControllerStateMaskingTest {
     // timeline.
     assertRemoveMediaItems(
         /* shuffleModeEnabled= */ true,
-        /* initialWindowIndex= */ 0,
+        /* initialMediaItemIndex= */ 0,
         /* testFromIndex= */ 0,
         /* testToIndex= */ 1,
-        /* testCurrentWindowIndex= */ 0,
+        /* testCurrentMediaItemIndex= */ 0,
         /* testCurrentPeriodIndex= */ 0,
         /* testTimeline= */ new PlaylistTimeline(
             createMediaItems(firstMediaId, secondMediaId, thirdMediaId, fourthMediaId),
@@ -2373,10 +2373,10 @@ public class MediaControllerStateMaskingTest {
     // should subtract size of removed items.
     assertRemoveMediaItems(
         /* shuffleModeEnabled= */ true,
-        /* initialWindowIndex= */ 0,
+        /* initialMediaItemIndex= */ 0,
         /* testFromIndex= */ 0,
         /* testToIndex= */ 1,
-        /* testCurrentWindowIndex= */ 2,
+        /* testCurrentMediaItemIndex= */ 2,
         /* testCurrentPeriodIndex= */ 2,
         /* testTimeline= */ new PlaylistTimeline(
             createMediaItems(firstMediaId, secondMediaId, thirdMediaId, fourthMediaId),
@@ -2387,10 +2387,10 @@ public class MediaControllerStateMaskingTest {
     // index should not subtract size of removed items.
     assertRemoveMediaItems(
         /* shuffleModeEnabled= */ true,
-        /* initialWindowIndex= */ 3,
+        /* initialMediaItemIndex= */ 3,
         /* testFromIndex= */ 3,
         /* testToIndex= */ 4,
-        /* testCurrentWindowIndex= */ 2,
+        /* testCurrentMediaItemIndex= */ 2,
         /* testCurrentPeriodIndex= */ 2,
         /* testTimeline= */ new PlaylistTimeline(
             createMediaItems(firstMediaId, secondMediaId, thirdMediaId, fourthMediaId),
@@ -2400,10 +2400,10 @@ public class MediaControllerStateMaskingTest {
 
   private void assertRemoveMediaItems(
       boolean shuffleModeEnabled,
-      int initialWindowIndex,
+      int initialMediaItemIndex,
       int testFromIndex,
       int testToIndex,
-      int testCurrentWindowIndex,
+      int testCurrentMediaItemIndex,
       int testCurrentPeriodIndex,
       Timeline testTimeline,
       String testMediaId)
@@ -2411,15 +2411,15 @@ public class MediaControllerStateMaskingTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(testTimeline)
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .setShuffleModeEnabled(shuffleModeEnabled)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     AtomicReference<MediaItem> currentMediaItemRef = new AtomicReference<>();
     threadTestRule
@@ -2428,11 +2428,11 @@ public class MediaControllerStateMaskingTest {
             () -> {
               controller.removeMediaItems(
                   /* fromIndex= */ testFromIndex, /* toIndex= */ testToIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
               currentMediaItemRef.set(controller.getCurrentMediaItem());
             });
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testCurrentPeriodIndex);
     assertThat(currentMediaItemRef.get().mediaId).isEqualTo(testMediaId);
   }
@@ -2440,7 +2440,7 @@ public class MediaControllerStateMaskingTest {
   @Test
   public void moveMediaItems_moveAllMediaItems_ignored() throws Exception {
     int initialMediaItemCount = 2;
-    int initialWindowIndex = 0;
+    int initialMediaItemIndex = 0;
     int testFromIndex = 0;
     int testToIndex = 2;
     int testNewIndex = 0;
@@ -2448,8 +2448,8 @@ public class MediaControllerStateMaskingTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(MediaTestUtils.createTimeline(initialMediaItemCount))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
 
@@ -2464,13 +2464,13 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.moveMediaItems(testFromIndex, testToIndex, testNewIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
             });
 
     assertThat(latch.await(NO_RESPONSE_TIMEOUT_MS, MILLISECONDS)).isFalse();
@@ -2482,24 +2482,24 @@ public class MediaControllerStateMaskingTest {
     String firstMediaId = "firstMediaId";
     String secondMediaId = "secondMediaId";
     String thirdMediaId = "thirdMediaId";
-    int initialWindowIndex = 0;
+    int initialMediaItemIndex = 0;
     int testFromIndex = 1;
     int testToIndex = 2;
     int testNewIndex = 0;
     String testCurrentMediaId = firstMediaId;
     String testPrevMediaId = secondMediaId;
     String testNextMediaId = thirdMediaId;
-    int testCurrentWindowIndex = 1;
-    int testPrevWindowIndex = 0;
-    int testNextWindowIndex = 2;
+    int testCurrentMediaItemIndex = 1;
+    int testPrevMediaItemIndex = 0;
+    int testNextMediaItemIndex = 2;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(
                 MediaTestUtils.createTimeline(
                     createMediaItems(firstMediaId, secondMediaId, thirdMediaId)))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
 
@@ -2523,37 +2523,43 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.moveMediaItems(testFromIndex, testToIndex, testNewIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
             });
 
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
     assertTimeline(
         newTimelineRef.get(),
         initialMediaItemCount,
-        testCurrentWindowIndex,
-        /* testFirstPeriodIndex= */ testCurrentWindowIndex,
-        /* testLastPeriodIndex= */ testCurrentWindowIndex);
+        testCurrentMediaItemIndex,
+        /* testFirstPeriodIndex= */ testCurrentMediaItemIndex,
+        /* testLastPeriodIndex= */ testCurrentMediaItemIndex);
     assertThat(
-            newTimelineRef.get().getWindow(testCurrentWindowIndex, new Window()).mediaItem.mediaId)
+            newTimelineRef
+                .get()
+                .getWindow(testCurrentMediaItemIndex, new Window())
+                .mediaItem
+                .mediaId)
         .isEqualTo(testCurrentMediaId);
-    assertThat(newTimelineRef.get().getWindow(testPrevWindowIndex, new Window()).mediaItem.mediaId)
+    assertThat(
+            newTimelineRef.get().getWindow(testPrevMediaItemIndex, new Window()).mediaItem.mediaId)
         .isEqualTo(testPrevMediaId);
-    assertThat(newTimelineRef.get().getWindow(testNextWindowIndex, new Window()).mediaItem.mediaId)
+    assertThat(
+            newTimelineRef.get().getWindow(testNextMediaItemIndex, new Window()).mediaItem.mediaId)
         .isEqualTo(testNextMediaId);
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
   }
 
   @Test
   public void moveMediaItems_moveCurrentItemBackOneWindow_whenPreviousWindowHasMultiplePeriods()
       throws Exception {
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     int initialPeriodIndex = 3;
     int prevWindowPeriodSize = 2;
 
@@ -2562,7 +2568,7 @@ public class MediaControllerStateMaskingTest {
             .setTimeline(
                 MediaTestUtils.createTimelineWithPeriodSizes(
                     new int[] {prevWindowPeriodSize, 3, 2}))
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialPeriodIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
@@ -2573,8 +2579,8 @@ public class MediaControllerStateMaskingTest {
         /* initialMediaItemCount= */ 3,
         /* testFromIndex= */ 1,
         /* testToIndex= */ 2,
-        /* testNewIndex= */ initialWindowIndex - 1,
-        /* testCurrentWindowIndex= */ initialWindowIndex - 1,
+        /* testNewIndex= */ initialMediaItemIndex - 1,
+        /* testCurrentMediaItemIndex= */ initialMediaItemIndex - 1,
         /* testCurrentWindowFirstPeriodIndex= */ initialWindowFirstPeriodIndex
             - prevWindowPeriodSize,
         /* testCurrentWindowLastPeriodIndex= */ initialWindowLastPeriodIndex - prevWindowPeriodSize,
@@ -2584,7 +2590,7 @@ public class MediaControllerStateMaskingTest {
   @Test
   public void moveMediaItems_moveCurrentItemForwardOneWindow_whenNextWindowHasMultiplePeriods()
       throws Exception {
-    int initialWindowIndex = 1;
+    int initialMediaItemIndex = 1;
     int initialPeriodIndex = 3;
     int nextWindowPeriodSize = 2;
 
@@ -2593,7 +2599,7 @@ public class MediaControllerStateMaskingTest {
             .setTimeline(
                 MediaTestUtils.createTimelineWithPeriodSizes(
                     new int[] {2, 3, nextWindowPeriodSize}))
-            .setCurrentWindowIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
             .setCurrentPeriodIndex(initialPeriodIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
@@ -2604,8 +2610,8 @@ public class MediaControllerStateMaskingTest {
         /* initialMediaItemCount= */ 3,
         /* testFromIndex= */ 1,
         /* testToIndex= */ 2,
-        /* testNewIndex= */ initialWindowIndex + 1,
-        /* testCurrentWindowIndex= */ initialWindowIndex + 1,
+        /* testNewIndex= */ initialMediaItemIndex + 1,
+        /* testCurrentMediaItemIndex= */ initialMediaItemIndex + 1,
         /* testCurrentWindowFirstPeriodIndex= */ initialWindowFirstPeriodIndex
             + nextWindowPeriodSize,
         /* testCurrentWindowLastPeriodIndex= */ initialWindowLastPeriodIndex + nextWindowPeriodSize,
@@ -2617,7 +2623,7 @@ public class MediaControllerStateMaskingTest {
       int testFromIndex,
       int testToIndex,
       int testNewIndex,
-      int testCurrentWindowIndex,
+      int testCurrentMediaItemIndex,
       int testCurrentWindowFirstPeriodIndex,
       int testCurrentWindowLastPeriodIndex,
       int testCurrentPeriodIndex)
@@ -2642,14 +2648,14 @@ public class MediaControllerStateMaskingTest {
         };
     threadTestRule.getHandler().postAndSync(() -> controller.addListener(listener));
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicInteger currentPeriodIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.moveMediaItems(testFromIndex, testToIndex, testNewIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentPeriodIndexRef.set(controller.getCurrentPeriodIndex());
             });
 
@@ -2657,11 +2663,11 @@ public class MediaControllerStateMaskingTest {
     assertTimeline(
         newTimelineRef.get(),
         initialMediaItemCount,
-        testCurrentWindowIndex,
+        testCurrentMediaItemIndex,
         /* testFirstPeriodIndex= */ testCurrentWindowFirstPeriodIndex,
         /* testLastPeriodIndex= */ testCurrentWindowLastPeriodIndex);
     assertThat(onEventsRef.get().contains(Player.EVENT_TIMELINE_CHANGED)).isTrue();
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
     assertThat(currentPeriodIndexRef.get()).isEqualTo(testCurrentPeriodIndex);
   }
 
@@ -2669,90 +2675,90 @@ public class MediaControllerStateMaskingTest {
   public void moveMediaItems_moveCurrentItemBackOneWindow() throws Exception {
     assertMoveMediaItems(
         /* initialMediaItemCount= */ 5,
-        /* initialWindowIndex= */ 1,
+        /* initialMediaItemIndex= */ 1,
         /* testFromIndex= */ 1,
         /* testToIndex= */ 2,
         /* testNewIndex= */ 0,
-        /* testCurrentWindowIndex= */ 0,
-        /* testNextWindowIndex= */ 1,
-        /* testPreviousWindowIndex= */ C.INDEX_UNSET);
+        /* testCurrentMediaItemIndex= */ 0,
+        /* testNextMediaItemIndex= */ 1,
+        /* testPreviousMediaItemIndex= */ C.INDEX_UNSET);
   }
 
   @Test
   public void moveMediaItems_moveCurrentItemForwardOneWindow() throws Exception {
     assertMoveMediaItems(
         /* initialMediaItemCount= */ 5,
-        /* initialWindowIndex= */ 1,
+        /* initialMediaItemIndex= */ 1,
         /* testFromIndex= */ 1,
         /* testToIndex= */ 2,
         /* testNewIndex= */ 2,
-        /* testCurrentWindowIndex= */ 2,
-        /* testNextWindowIndex= */ 3,
-        /* testPreviousWindowIndex= */ 1);
+        /* testCurrentMediaItemIndex= */ 2,
+        /* testNextMediaItemIndex= */ 3,
+        /* testPreviousMediaItemIndex= */ 1);
   }
 
   @Test
   public void moveMediaItems_moveNonCurrentItem_fromAfterCurrentItemToBefore() throws Exception {
     assertMoveMediaItems(
         /* initialMediaItemCount= */ 5,
-        /* initialWindowIndex= */ 1,
+        /* initialMediaItemIndex= */ 1,
         /* testFromIndex= */ 2,
         /* testToIndex= */ 4,
         /* testNewIndex= */ 1,
-        /* testCurrentWindowIndex= */ 3,
-        /* testNextWindowIndex= */ 4,
-        /* testPreviousWindowIndex= */ 2);
+        /* testCurrentMediaItemIndex= */ 3,
+        /* testNextMediaItemIndex= */ 4,
+        /* testPreviousMediaItemIndex= */ 2);
   }
 
   @Test
   public void moveMediaItems_moveNonCurrentItem_fromBeforeCurrentItemToAfter() throws Exception {
     assertMoveMediaItems(
         /* initialMediaItemCount= */ 5,
-        /* initialWindowIndex= */ 1,
+        /* initialMediaItemIndex= */ 1,
         /* testFromIndex= */ 0,
         /* testToIndex= */ 1,
         /* testNewIndex= */ 2,
-        /* testCurrentWindowIndex= */ 0,
-        /* testNextWindowIndex= */ 1,
-        /* testPreviousWindowIndex= */ C.INDEX_UNSET);
+        /* testCurrentMediaItemIndex= */ 0,
+        /* testNextMediaItemIndex= */ 1,
+        /* testPreviousMediaItemIndex= */ C.INDEX_UNSET);
   }
 
   private void assertMoveMediaItems(
       int initialMediaItemCount,
-      int initialWindowIndex,
+      int initialMediaItemIndex,
       int testFromIndex,
       int testToIndex,
       int testNewIndex,
-      int testCurrentWindowIndex,
-      int testNextWindowIndex,
-      int testPreviousWindowIndex)
+      int testCurrentMediaItemIndex,
+      int testNextMediaItemIndex,
+      int testPreviousMediaItemIndex)
       throws Exception {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(MediaTestUtils.createTimeline(initialMediaItemCount))
-            .setCurrentWindowIndex(initialWindowIndex)
-            .setCurrentPeriodIndex(initialWindowIndex)
+            .setCurrentMediaItemIndex(initialMediaItemIndex)
+            .setCurrentPeriodIndex(initialMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
 
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
-    AtomicInteger nextWindowIndexRef = new AtomicInteger();
-    AtomicInteger previousWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger nextMediaItemIndexRef = new AtomicInteger();
+    AtomicInteger previousMediaItemIndexRef = new AtomicInteger();
     threadTestRule
         .getHandler()
         .postAndSync(
             () -> {
               controller.moveMediaItems(testFromIndex, testToIndex, testNewIndex);
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
-              nextWindowIndexRef.set(controller.getNextWindowIndex());
-              previousWindowIndexRef.set(controller.getPreviousWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
+              nextMediaItemIndexRef.set(controller.getNextMediaItemIndex());
+              previousMediaItemIndexRef.set(controller.getPreviousMediaItemIndex());
             });
 
-    assertThat(currentWindowIndexRef.get()).isEqualTo(testCurrentWindowIndex);
-    assertThat(nextWindowIndexRef.get()).isEqualTo(testNextWindowIndex);
-    assertThat(previousWindowIndexRef.get()).isEqualTo(testPreviousWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(testCurrentMediaItemIndex);
+    assertThat(nextMediaItemIndexRef.get()).isEqualTo(testNextMediaItemIndex);
+    assertThat(previousMediaItemIndexRef.get()).isEqualTo(testPreviousMediaItemIndex);
   }
 
   @Test
@@ -2845,17 +2851,17 @@ public class MediaControllerStateMaskingTest {
   private void assertTimeline(
       Timeline timeline,
       int testMediaItemCount,
-      int testWindowIndex,
+      int testMediaItemIndex,
       int testFirstPeriodIndex,
       int testLastPeriodIndex) {
     assertThat(timeline.getWindowCount()).isEqualTo(testMediaItemCount);
     if (testMediaItemCount > 0) {
-      Window window = timeline.getWindow(testWindowIndex, new Window());
+      Window window = timeline.getWindow(testMediaItemIndex, new Window());
       assertThat(window.firstPeriodIndex).isEqualTo(testFirstPeriodIndex);
       assertThat(window.lastPeriodIndex).isEqualTo(testLastPeriodIndex);
       Period period = timeline.getPeriod(testFirstPeriodIndex, new Period());
-      assertThat(period.windowIndex).isEqualTo(testWindowIndex);
-      assertThat(period.windowIndex).isEqualTo(testWindowIndex);
+      assertThat(period.windowIndex).isEqualTo(testMediaItemIndex);
+      assertThat(period.windowIndex).isEqualTo(testMediaItemIndex);
     }
   }
 }

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerTest.java

@@ -246,9 +246,9 @@ public class MediaControllerTest {
     TrackSelectionParameters trackSelectionParameters =
         TrackSelectionParameters.DEFAULT_WITHOUT_CONTEXT.buildUpon().setMaxVideoSizeSd().build();
     Timeline timeline = MediaTestUtils.createTimeline(5);
-    int currentWindowIndex = 3;
+    int currentMediaItemIndex = 3;
     MediaItem currentMediaItem =
-        timeline.getWindow(currentWindowIndex, new Timeline.Window()).mediaItem;
+        timeline.getWindow(currentMediaItemIndex, new Timeline.Window()).mediaItem;
 
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
@@ -277,7 +277,7 @@ public class MediaControllerTest {
             .setMaxSeekToPreviousPositionMs(maxSeekToPreviousPositionMs)
             .setTrackSelectionParameters(trackSelectionParameters)
             .setTimeline(timeline)
-            .setCurrentWindowIndex(currentWindowIndex)
+            .setCurrentMediaItemIndex(currentMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
@@ -309,7 +309,7 @@ public class MediaControllerTest {
     AtomicLong maxSeekToPreviousPositionMsRef = new AtomicLong();
     AtomicReference<TrackSelectionParameters> trackSelectionParametersRef = new AtomicReference<>();
     AtomicReference<Timeline> timelineRef = new AtomicReference<>();
-    AtomicInteger currentWindowIndexRef = new AtomicInteger();
+    AtomicInteger currentMediaItemIndexRef = new AtomicInteger();
     AtomicReference<MediaItem> currentMediaItemRef = new AtomicReference<>();
     threadTestRule
         .getHandler()
@@ -341,7 +341,7 @@ public class MediaControllerTest {
               maxSeekToPreviousPositionMsRef.set(controller.getMaxSeekToPreviousPosition());
               trackSelectionParametersRef.set(controller.getTrackSelectionParameters());
               timelineRef.set(controller.getCurrentTimeline());
-              currentWindowIndexRef.set(controller.getCurrentWindowIndex());
+              currentMediaItemIndexRef.set(controller.getCurrentMediaItemIndex());
               currentMediaItemRef.set(controller.getCurrentMediaItem());
             });
 
@@ -370,7 +370,7 @@ public class MediaControllerTest {
     assertThat(maxSeekToPreviousPositionMsRef.get()).isEqualTo(maxSeekToPreviousPositionMs);
     assertThat(trackSelectionParametersRef.get()).isEqualTo(trackSelectionParameters);
     assertTimelineMediaItemsEquals(timelineRef.get(), timeline);
-    assertThat(currentWindowIndexRef.get()).isEqualTo(currentWindowIndex);
+    assertThat(currentMediaItemIndexRef.get()).isEqualTo(currentMediaItemIndex);
     assertThat(currentMediaItemRef.get()).isEqualTo(currentMediaItem);
   }
 
@@ -509,19 +509,19 @@ public class MediaControllerTest {
   }
 
   @Test
-  public void getCurrentWindowIndex() throws Exception {
-    int testWindowIndex = 1;
+  public void getCurrentMediaItemIndex() throws Exception {
+    int testMediaItemIndex = 1;
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
-            .setCurrentWindowIndex(testWindowIndex)
+            .setCurrentMediaItemIndex(testMediaItemIndex)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int currentWindowIndex =
-        threadTestRule.getHandler().postAndSync(controller::getCurrentWindowIndex);
+    int currentMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getCurrentMediaItemIndex);
 
-    assertThat(currentWindowIndex).isEqualTo(testWindowIndex);
+    assertThat(currentMediaItemIndex).isEqualTo(testMediaItemIndex);
   }
 
   @Test
@@ -541,83 +541,83 @@ public class MediaControllerTest {
   }
 
   @Test
-  public void getPreviousWindowIndex() throws Exception {
+  public void getPreviousMediaItemIndex() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(1)
+            .setCurrentMediaItemIndex(1)
             .setRepeatMode(Player.REPEAT_MODE_OFF)
             .setShuffleModeEnabled(false)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int previousWindowIndex =
-        threadTestRule.getHandler().postAndSync(controller::getPreviousWindowIndex);
+    int previousMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getPreviousMediaItemIndex);
 
-    assertThat(previousWindowIndex).isEqualTo(0);
+    assertThat(previousMediaItemIndex).isEqualTo(0);
   }
 
   @Test
-  public void getPreviousWindowIndex_withRepeatModeOne() throws Exception {
+  public void getPreviousMediaItemIndex_withRepeatModeOne() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(1)
+            .setCurrentMediaItemIndex(1)
             .setRepeatMode(Player.REPEAT_MODE_ONE)
             .setShuffleModeEnabled(false)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int previousWindowIndex =
-        threadTestRule.getHandler().postAndSync(controller::getPreviousWindowIndex);
+    int previousMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getPreviousMediaItemIndex);
 
-    assertThat(previousWindowIndex).isEqualTo(0);
+    assertThat(previousMediaItemIndex).isEqualTo(0);
   }
 
   @Test
-  public void getPreviousWindowIndex_atTheFirstWindow() throws Exception {
+  public void getPreviousMediaItemIndex_atTheFirstMediaItem() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(0)
+            .setCurrentMediaItemIndex(0)
             .setRepeatMode(Player.REPEAT_MODE_OFF)
             .setShuffleModeEnabled(false)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int previousWindowIndex =
-        threadTestRule.getHandler().postAndSync(controller::getPreviousWindowIndex);
+    int previousMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getPreviousMediaItemIndex);
 
-    assertThat(previousWindowIndex).isEqualTo(C.INDEX_UNSET);
+    assertThat(previousMediaItemIndex).isEqualTo(C.INDEX_UNSET);
   }
 
   @Test
-  public void getPreviousWindowIndex_atTheFirstWindowWithRepeatModeAll() throws Exception {
+  public void getPreviousMediaItemIndex_atTheFirstMediaItemWithRepeatModeAll() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(0)
+            .setCurrentMediaItemIndex(0)
             .setRepeatMode(Player.REPEAT_MODE_ALL)
             .setShuffleModeEnabled(false)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int previousWindowIndex =
-        threadTestRule.getHandler().postAndSync(controller::getPreviousWindowIndex);
+    int previousMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getPreviousMediaItemIndex);
 
-    assertThat(previousWindowIndex).isEqualTo(2);
+    assertThat(previousMediaItemIndex).isEqualTo(2);
   }
 
   @Test
-  public void getPreviousWindowIndex_withShuffleModeEnabled() throws Exception {
+  public void getPreviousMediaItemIndex_withShuffleModeEnabled() throws Exception {
     Timeline timeline =
         new PlaylistTimeline(
             MediaTestUtils.createMediaItems(/* size= */ 3),
@@ -625,93 +625,97 @@ public class MediaControllerTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(2)
+            .setCurrentMediaItemIndex(2)
             .setRepeatMode(Player.REPEAT_MODE_OFF)
             .setShuffleModeEnabled(true)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int previousWindowIndex =
-        threadTestRule.getHandler().postAndSync(controller::getPreviousWindowIndex);
+    int previousMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getPreviousMediaItemIndex);
 
-    assertThat(previousWindowIndex).isEqualTo(0);
+    assertThat(previousMediaItemIndex).isEqualTo(0);
   }
 
   @Test
-  public void getNextWindowIndex() throws Exception {
+  public void getNextMediaItemIndex() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(1)
+            .setCurrentMediaItemIndex(1)
             .setRepeatMode(Player.REPEAT_MODE_OFF)
             .setShuffleModeEnabled(false)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int nextWindowIndex = threadTestRule.getHandler().postAndSync(controller::getNextWindowIndex);
+    int nextMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getNextMediaItemIndex);
 
-    assertThat(nextWindowIndex).isEqualTo(2);
+    assertThat(nextMediaItemIndex).isEqualTo(2);
   }
 
   @Test
-  public void getNextWindowIndex_withRepeatModeOne() throws Exception {
+  public void getNextMediaItemIndex_withRepeatModeOne() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(1)
+            .setCurrentMediaItemIndex(1)
             .setRepeatMode(Player.REPEAT_MODE_ONE)
             .setShuffleModeEnabled(false)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int nextWindowIndex = threadTestRule.getHandler().postAndSync(controller::getNextWindowIndex);
+    int nextMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getNextMediaItemIndex);
 
-    assertThat(nextWindowIndex).isEqualTo(2);
+    assertThat(nextMediaItemIndex).isEqualTo(2);
   }
 
   @Test
-  public void getNextWindowIndex_atTheLastWindow() throws Exception {
+  public void getNextMediaItemIndex_atTheLastMediaItem() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(2)
+            .setCurrentMediaItemIndex(2)
             .setRepeatMode(Player.REPEAT_MODE_OFF)
             .setShuffleModeEnabled(false)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int nextWindowIndex = threadTestRule.getHandler().postAndSync(controller::getNextWindowIndex);
+    int nextMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getNextMediaItemIndex);
 
-    assertThat(nextWindowIndex).isEqualTo(C.INDEX_UNSET);
+    assertThat(nextMediaItemIndex).isEqualTo(C.INDEX_UNSET);
   }
 
   @Test
-  public void getNextWindowIndex_atTheLastWindowWithRepeatModeAll() throws Exception {
+  public void getNextMediaItemIndex_atTheLastMediaItemWithRepeatModeAll() throws Exception {
     Timeline timeline = MediaTestUtils.createTimeline(/* windowCount= */ 3);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(2)
+            .setCurrentMediaItemIndex(2)
             .setRepeatMode(Player.REPEAT_MODE_ALL)
             .setShuffleModeEnabled(false)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int nextWindowIndex = threadTestRule.getHandler().postAndSync(controller::getNextWindowIndex);
+    int nextMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getNextMediaItemIndex);
 
-    assertThat(nextWindowIndex).isEqualTo(0);
+    assertThat(nextMediaItemIndex).isEqualTo(0);
   }
 
   @Test
-  public void getNextWindowIndex_withShuffleModeEnabled() throws Exception {
+  public void getNextMediaItemIndex_withShuffleModeEnabled() throws Exception {
     Timeline timeline =
         new PlaylistTimeline(
             MediaTestUtils.createMediaItems(/* size= */ 3),
@@ -719,16 +723,17 @@ public class MediaControllerTest {
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder()
             .setTimeline(timeline)
-            .setCurrentWindowIndex(2)
+            .setCurrentMediaItemIndex(2)
             .setRepeatMode(Player.REPEAT_MODE_OFF)
             .setShuffleModeEnabled(true)
             .build();
     remoteSession.setPlayer(playerConfig);
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
-    int nextWindowIndex = threadTestRule.getHandler().postAndSync(controller::getNextWindowIndex);
+    int nextMediaItemIndex =
+        threadTestRule.getHandler().postAndSync(controller::getNextMediaItemIndex);
 
-    assertThat(nextWindowIndex).isEqualTo(1);
+    assertThat(nextMediaItemIndex).isEqualTo(1);
   }
 
   @Test
@@ -748,7 +753,7 @@ public class MediaControllerTest {
   @Test
   public void getMediaItemAt() throws Exception {
     int windowCount = 3;
-    int windowIndex = 1;
+    int mediaItemIndex = 1;
     Timeline timeline = MediaTestUtils.createTimeline(windowCount);
     Bundle playerConfig =
         new RemoteMediaSession.MockPlayerConfigBuilder().setTimeline(timeline).build();
@@ -756,10 +761,10 @@ public class MediaControllerTest {
 
     MediaController controller = controllerTestRule.createController(remoteSession.getToken());
     MediaItem mediaItem =
-        threadTestRule.getHandler().postAndSync(() -> controller.getMediaItemAt(windowIndex));
+        threadTestRule.getHandler().postAndSync(() -> controller.getMediaItemAt(mediaItemIndex));
 
     assertThat(mediaItem)
-        .isEqualTo(timeline.getWindow(windowIndex, new Timeline.Window()).mediaItem);
+        .isEqualTo(timeline.getWindow(mediaItemIndex, new Timeline.Window()).mediaItem);
   }
 
   private RemoteMediaSession createRemoteMediaSession(String id, Bundle tokenExtras)

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCallbackWithMediaControllerCompatTest.java

@@ -435,8 +435,8 @@ public class MediaSessionCallbackWithMediaControllerCompatTest {
     controller.getTransportControls().skipToQueueItem(queue.get(targetIndex).getQueueId());
 
     assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
-    assertThat(player.seekToDefaultPositionWithWindowIndexCalled).isTrue();
-    assertThat(player.seekWindowIndex).isEqualTo(targetIndex);
+    assertThat(player.seekToDefaultPositionWithMediaItemIndexCalled).isTrue();
+    assertThat(player.seekMediaItemIndex).isEqualTo(targetIndex);
   }
 
   @Test

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCompatCallbackWithMediaControllerTest.java

@@ -172,8 +172,8 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
   }
 
   @Test
-  public void seekToDefaultPosition_withWindowIndex() throws Exception {
-    int testWindowIndex = 1;
+  public void seekToDefaultPosition_withMediaItemIndex() throws Exception {
+    int testMediaItemIndex = 1;
     List<QueueItem> testQueue = MediaTestUtils.createQueueItems(/* size= */ 3);
 
     session.setQueue(testQueue);
@@ -182,16 +182,17 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
 
     sessionCallback.reset(2);
 
-    controller.seekToDefaultPosition(testWindowIndex);
+    controller.seekToDefaultPosition(testMediaItemIndex);
     assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
     assertThat(sessionCallback.onSkipToQueueItemCalled).isTrue();
-    assertThat(sessionCallback.queueItemId).isEqualTo(testQueue.get(testWindowIndex).getQueueId());
+    assertThat(sessionCallback.queueItemId)
+        .isEqualTo(testQueue.get(testMediaItemIndex).getQueueId());
     assertThat(sessionCallback.onSeekToCalled).isTrue();
     assertThat(sessionCallback.seekPosition).isEqualTo(/* pos= */ 0);
   }
 
   @Test
-  public void seekToDefaultPosition_withFakeWindowIndex_seeksWithPosition() throws Exception {
+  public void seekToDefaultPosition_withFakeMediaItemIndex_seeksWithPosition() throws Exception {
     List<QueueItem> testQueue = MediaTestUtils.createQueueItems(/* size= */ 3);
     int fakeItemIndex = testQueue.size();
     MediaMetadataCompat testMetadata =
@@ -226,8 +227,8 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
   }
 
   @Test
-  public void seekTo_withWindowIndex() throws Exception {
-    int testWindowIndex = 1;
+  public void seekTo_withMediaItemIndex() throws Exception {
+    int testMediaItemIndex = 1;
     long testPositionMs = 12L;
 
     List<QueueItem> testQueue = MediaTestUtils.createQueueItems(/* size= */ 3);
@@ -238,10 +239,11 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
 
     sessionCallback.reset(2);
 
-    controller.seekTo(testWindowIndex, testPositionMs);
+    controller.seekTo(testMediaItemIndex, testPositionMs);
     assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
     assertThat(sessionCallback.onSkipToQueueItemCalled).isTrue();
-    assertThat(sessionCallback.queueItemId).isEqualTo(testQueue.get(testWindowIndex).getQueueId());
+    assertThat(sessionCallback.queueItemId)
+        .isEqualTo(testQueue.get(testMediaItemIndex).getQueueId());
     assertThat(sessionCallback.onSeekToCalled).isTrue();
     assertThat(sessionCallback.seekPosition).isEqualTo(testPositionMs);
   }
@@ -350,21 +352,21 @@ public class MediaSessionCompatCallbackWithMediaControllerTest {
   }
 
   @Test
-  public void seekToPreviousWindow() throws Exception {
+  public void seekToPreviousMediaItem() throws Exception {
     RemoteMediaController controller = createControllerAndWaitConnection();
     sessionCallback.reset(1);
 
-    controller.seekToPreviousWindow();
+    controller.seekToPreviousMediaItem();
     assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
     assertThat(sessionCallback.onSkipToPreviousCalled).isTrue();
   }
 
   @Test
-  public void seekToNextWindow() throws Exception {
+  public void seekToNextMediaItem() throws Exception {
     RemoteMediaController controller = createControllerAndWaitConnection();
     sessionCallback.reset(1);
 
-    controller.seekToNextWindow();
+    controller.seekToNextMediaItem();
     assertThat(sessionCallback.await(TIMEOUT_MS)).isTrue();
     assertThat(sessionCallback.onSkipToNextCalled).isTrue();
   }

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPermissionTest.java

@@ -164,14 +164,15 @@ public class MediaSessionPermissionTest {
   }
 
   @Test
-  public void seekToNextWindow() throws Exception {
-    testOnCommandRequest(COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, RemoteMediaController::seekToNextWindow);
+  public void seekToNextMediaItem() throws Exception {
+    testOnCommandRequest(
+        COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, RemoteMediaController::seekToNextMediaItem);
   }
 
   @Test
-  public void seekToPreviousWindow() throws Exception {
+  public void seekToPreviousMediaItem() throws Exception {
     testOnCommandRequest(
-        COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, RemoteMediaController::seekToPreviousWindow);
+        COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, RemoteMediaController::seekToPreviousMediaItem);
   }
 
   @Test

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPlayerTest.java

@@ -138,12 +138,12 @@ public class MediaSessionPlayerTest {
   }
 
   @Test
-  public void seekToDefaultPosition_withWindowIndex() throws Exception {
-    int windowIndex = 3;
-    controller.seekToDefaultPosition(windowIndex);
+  public void seekToDefaultPosition_withMediaItemIndex() throws Exception {
+    int mediaItemIndex = 3;
+    controller.seekToDefaultPosition(mediaItemIndex);
     assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
-    assertThat(player.seekToDefaultPositionWithWindowIndexCalled).isTrue();
-    assertThat(player.seekWindowIndex).isEqualTo(windowIndex);
+    assertThat(player.seekToDefaultPositionWithMediaItemIndexCalled).isTrue();
+    assertThat(player.seekMediaItemIndex).isEqualTo(mediaItemIndex);
   }
 
   @Test
@@ -156,13 +156,13 @@ public class MediaSessionPlayerTest {
   }
 
   @Test
-  public void seekTo_withWindowIndex() throws Exception {
-    int windowIndex = 3;
+  public void seekTo_withMediaItemIndex() throws Exception {
+    int mediaItemIndex = 3;
     long seekPositionMs = 12125L;
-    controller.seekTo(windowIndex, seekPositionMs);
+    controller.seekTo(mediaItemIndex, seekPositionMs);
     assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
-    assertThat(player.seekToWithWindowIndexCalled).isTrue();
-    assertThat(player.seekWindowIndex).isEqualTo(windowIndex);
+    assertThat(player.seekToWithMediaItemIndexCalled).isTrue();
+    assertThat(player.seekMediaItemIndex).isEqualTo(mediaItemIndex);
     assertThat(player.seekPositionMs).isEqualTo(seekPositionMs);
   }
 
@@ -260,17 +260,17 @@ public class MediaSessionPlayerTest {
   }
 
   @Test
-  public void setMediaItems_withStartWindowIndex() throws Exception {
+  public void setMediaItems_withStartMediaItemIndex() throws Exception {
     List<MediaItem> items = MediaTestUtils.createMediaItems(/* size= */ 2);
-    int startWindowIndex = 1;
+    int startMediaItemIndex = 1;
     long startPositionMs = 1234;
 
-    controller.setMediaItems(items, startWindowIndex, startPositionMs);
+    controller.setMediaItems(items, startMediaItemIndex, startPositionMs);
 
     assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
-    assertThat(player.setMediaItemsWithStartWindowIndexCalled).isTrue();
+    assertThat(player.setMediaItemsWithStartIndexCalled).isTrue();
     assertThat(player.mediaItems).isEqualTo(items);
-    assertThat(player.startWindowIndex).isEqualTo(startWindowIndex);
+    assertThat(player.startMediaItemIndex).isEqualTo(startMediaItemIndex);
     assertThat(player.startPositionMs).isEqualTo(startPositionMs);
   }
 
@@ -426,15 +426,15 @@ public class MediaSessionPlayerTest {
   }
 
   @Test
-  public void seekToPreviousWindow() throws Exception {
-    controller.seekToPreviousWindow();
+  public void seekToPreviousMediaItem() throws Exception {
+    controller.seekToPreviousMediaItem();
     assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
     assertThat(player.seekToPreviousMediaItemCalled).isTrue();
   }
 
   @Test
-  public void seekToNextWindow() throws Exception {
-    controller.seekToNextWindow();
+  public void seekToNextMediaItem() throws Exception {
+    controller.seekToNextMediaItem();
     assertThat(player.countDownLatch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
     assertThat(player.seekToNextMediaItemCalled).isTrue();
   }

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionTest.java

@@ -247,7 +247,7 @@ public class MediaSessionTest {
               Log.d(TAG, "7) Time spent on API call(ms): " + (endTime - startTime));
 
               startTime = endTime;
-              controller.seekToNextWindow();
+              controller.seekToNextMediaItem();
               endTime = SystemClock.elapsedRealtime();
               Log.d(TAG, "8) Time spent on API call(ms): " + (endTime - startTime));
 
@@ -257,7 +257,7 @@ public class MediaSessionTest {
               Log.d(TAG, "9) Time spent on API call(ms): " + (endTime - startTime));
 
               startTime = endTime;
-              controller.seekToPreviousWindow();
+              controller.seekToPreviousMediaItem();
               endTime = SystemClock.elapsedRealtime();
               Log.d(TAG, "10) Time spent on API call(ms): " + (endTime - startTime));
             }

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MockPlayerTest.java

@@ -166,8 +166,8 @@ public class MockPlayerTest {
     int startWindowIndex = 3;
     long startPositionMs = 132L;
     player.setMediaItems(list, startWindowIndex, startPositionMs);
-    assertThat(player.setMediaItemsWithStartWindowIndexCalled).isTrue();
-    assertThat(player.startWindowIndex).isEqualTo(startWindowIndex);
+    assertThat(player.setMediaItemsWithStartIndexCalled).isTrue();
+    assertThat(player.startMediaItemIndex).isEqualTo(startWindowIndex);
     assertThat(player.startPositionMs).isEqualTo(startPositionMs);
     assertThat(player.mediaItems).isSameInstanceAs(list);
   }

libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java

@@ -216,12 +216,12 @@ public class MediaControllerProviderService extends Service {
     }
 
     @Override
-    public void seekToDefaultPositionWithWindowIndex(String controllerId, int windowIndex)
+    public void seekToDefaultPositionWithMediaItemIndex(String controllerId, int mediaItemIndex)
         throws RemoteException {
       runOnHandler(
           () -> {
             MediaController controller = mediaControllerMap.get(controllerId);
-            controller.seekToDefaultPosition(windowIndex);
+            controller.seekToDefaultPosition(mediaItemIndex);
           });
     }
 
@@ -235,12 +235,12 @@ public class MediaControllerProviderService extends Service {
     }
 
     @Override
-    public void seekToWithWindowIndex(String controllerId, int windowIndex, long positionMs)
+    public void seekToWithMediaItemIndex(String controllerId, int mediaItemIndex, long positionMs)
         throws RemoteException {
       runOnHandler(
           () -> {
             MediaController controller = mediaControllerMap.get(controllerId);
-            controller.seekTo(windowIndex, positionMs);
+            controller.seekTo(mediaItemIndex, positionMs);
           });
     }
 
@@ -336,18 +336,15 @@ public class MediaControllerProviderService extends Service {
     }
 
     @Override
-    public void setMediaItemsWithStartWindowIndex(
-        String controllerId,
-        List<Bundle> mediaItemBundles,
-        int startWindowIndex,
-        long startPositionMs)
+    public void setMediaItemsWithStartIndex(
+        String controllerId, List<Bundle> mediaItemBundles, int startIndex, long startPositionMs)
         throws RemoteException {
       runOnHandler(
           () -> {
             MediaController controller = mediaControllerMap.get(controllerId);
             controller.setMediaItems(
                 BundleableUtil.fromBundleList(MediaItem.CREATOR, mediaItemBundles),
-                startWindowIndex,
+                startIndex,
                 startPositionMs);
           });
     }
@@ -478,20 +475,20 @@ public class MediaControllerProviderService extends Service {
     }
 
     @Override
-    public void seekToPreviousWindow(String controllerId) throws RemoteException {
+    public void seekToPreviousMediaItem(String controllerId) throws RemoteException {
       runOnHandler(
           () -> {
             MediaController controller = mediaControllerMap.get(controllerId);
-            controller.seekToPreviousWindow();
+            controller.seekToPreviousMediaItem();
           });
     }
 
     @Override
-    public void seekToNextWindow(String controllerId) throws RemoteException {
+    public void seekToNextMediaItem(String controllerId) throws RemoteException {
       runOnHandler(
           () -> {
             MediaController controller = mediaControllerMap.get(controllerId);
-            controller.seekToNextWindow();
+            controller.seekToNextMediaItem();
           });
     }
 

libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java

@@ -26,9 +26,9 @@ import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_AD
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_AD_INDEX_IN_AD_GROUP;
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_CUES;
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_LIVE_OFFSET;
+import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_MEDIA_ITEM_INDEX;
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_PERIOD_INDEX;
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_POSITION;
-import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_WINDOW_INDEX;
 import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_INFO;
 import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_MUTED;
 import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_VOLUME;
@@ -287,7 +287,7 @@ public class MediaSessionProviderService extends Service {
           BundleableUtil.fromNullableBundle(
               Timeline.CREATOR, config.getBundle(KEY_TIMELINE), player.timeline);
       player.currentMediaItemIndex =
-          config.getInt(KEY_CURRENT_WINDOW_INDEX, player.currentMediaItemIndex);
+          config.getInt(KEY_CURRENT_MEDIA_ITEM_INDEX, player.currentMediaItemIndex);
       player.currentPeriodIndex =
           config.getInt(KEY_CURRENT_PERIOD_INDEX, player.currentPeriodIndex);
       player.playlistMetadata =
@@ -749,7 +749,7 @@ public class MediaSessionProviderService extends Service {
     }
 
     @Override
-    public void setCurrentWindowIndex(String sessionId, int index) throws RemoteException {
+    public void setCurrentMediaItemIndex(String sessionId, int index) throws RemoteException {
       runOnHandler(
           () -> {
             MediaSession session = sessionMap.get(sessionId);

libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java

@@ -55,7 +55,7 @@ public class MockPlayer implements Player {
   @Nullable PlaybackException playerError;
   public AudioAttributes audioAttributes;
   public long seekPositionMs;
-  public int seekWindowIndex;
+  public int seekMediaItemIndex;
   public long currentPosition;
   public long bufferedPosition;
   public long duration;
@@ -73,7 +73,7 @@ public class MockPlayer implements Player {
   public MediaItem mediaItem;
   public List<MediaItem> mediaItems;
   public boolean resetPosition;
-  public int startWindowIndex;
+  public int startMediaItemIndex;
   public long startPositionMs;
   public MediaMetadata playlistMetadata;
   public int index;
@@ -112,9 +112,9 @@ public class MockPlayer implements Player {
   public boolean stopCalled;
   public boolean releaseCalled;
   public boolean seekToDefaultPositionCalled;
-  public boolean seekToDefaultPositionWithWindowIndexCalled;
+  public boolean seekToDefaultPositionWithMediaItemIndexCalled;
   public boolean seekToCalled;
-  public boolean seekToWithWindowIndexCalled;
+  public boolean seekToWithMediaItemIndexCalled;
   public boolean setPlaybackSpeedCalled;
   public boolean setPlaybackParametersCalled;
   public boolean setMediaItemCalled;
@@ -122,7 +122,7 @@ public class MockPlayer implements Player {
   public boolean setMediaItemWithResetPositionCalled;
   public boolean setMediaItemsCalled;
   public boolean setMediaItemsWithResetPositionCalled;
-  public boolean setMediaItemsWithStartWindowIndexCalled;
+  public boolean setMediaItemsWithStartIndexCalled;
   public boolean setPlaylistMetadataCalled;
   public boolean addMediaItemCalled;
   public boolean addMediaItemWithIndexCalled;
@@ -180,7 +180,7 @@ public class MockPlayer implements Player {
     cues = ImmutableList.of();
     deviceInfo = DeviceInfo.UNKNOWN;
     seekPositionMs = C.TIME_UNSET;
-    seekWindowIndex = C.INDEX_UNSET;
+    seekMediaItemIndex = C.INDEX_UNSET;
     mediaMetadata = MediaMetadata.EMPTY;
 
     currentPosition = 0;
@@ -271,8 +271,8 @@ public class MockPlayer implements Player {
 
   @Override
   public void seekToDefaultPosition(int mediaItemIndex) {
-    seekToDefaultPositionWithWindowIndexCalled = true;
-    seekWindowIndex = mediaItemIndex;
+    seekToDefaultPositionWithMediaItemIndexCalled = true;
+    seekMediaItemIndex = mediaItemIndex;
     countDownLatch.countDown();
   }
 
@@ -285,8 +285,8 @@ public class MockPlayer implements Player {
 
   @Override
   public void seekTo(int mediaItemIndex, long positionMs) {
-    seekToWithWindowIndexCalled = true;
-    seekWindowIndex = mediaItemIndex;
+    seekToWithMediaItemIndexCalled = true;
+    seekMediaItemIndex = mediaItemIndex;
     seekPositionMs = positionMs;
     countDownLatch.countDown();
   }
@@ -666,9 +666,9 @@ public class MockPlayer implements Player {
 
   @Override
   public void setMediaItems(List<MediaItem> mediaItems, int startIndex, long startPositionMs) {
-    setMediaItemsWithStartWindowIndexCalled = true;
+    setMediaItemsWithStartIndexCalled = true;
     this.mediaItems = mediaItems;
-    this.startWindowIndex = startIndex;
+    this.startMediaItemIndex = startIndex;
     this.startPositionMs = startPositionMs;
     countDownLatch.countDown();
   }

libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java

@@ -112,16 +112,16 @@ public class RemoteMediaController {
     binder.seekToDefaultPosition(controllerId);
   }
 
-  public void seekToDefaultPosition(int windowIndex) throws RemoteException {
-    binder.seekToDefaultPositionWithWindowIndex(controllerId, windowIndex);
+  public void seekToDefaultPosition(int mediaItemIndex) throws RemoteException {
+    binder.seekToDefaultPositionWithMediaItemIndex(controllerId, mediaItemIndex);
   }
 
   public void seekTo(long positionMs) throws RemoteException {
     binder.seekTo(controllerId, positionMs);
   }
 
-  public void seekTo(int windowIndex, long positionMs) throws RemoteException {
-    binder.seekToWithWindowIndex(controllerId, windowIndex, positionMs);
+  public void seekTo(int mediaItemIndex, long positionMs) throws RemoteException {
+    binder.seekToWithMediaItemIndex(controllerId, mediaItemIndex, positionMs);
   }
 
   public void seekBack() throws RemoteException {
@@ -162,10 +162,10 @@ public class RemoteMediaController {
         controllerId, BundleableUtil.toBundleList(mediaItems), resetPosition);
   }
 
-  public void setMediaItems(List<MediaItem> mediaItems, int startWindowIndex, long startPositionMs)
+  public void setMediaItems(List<MediaItem> mediaItems, int startIndex, long startPositionMs)
       throws RemoteException {
-    binder.setMediaItemsWithStartWindowIndex(
-        controllerId, BundleableUtil.toBundleList(mediaItems), startWindowIndex, startPositionMs);
+    binder.setMediaItemsWithStartIndex(
+        controllerId, BundleableUtil.toBundleList(mediaItems), startIndex, startPositionMs);
   }
 
   /**
@@ -222,12 +222,12 @@ public class RemoteMediaController {
     binder.moveMediaItems(controllerId, fromIndex, toIndex, newIndex);
   }
 
-  public void seekToPreviousWindow() throws RemoteException {
-    binder.seekToPreviousWindow(controllerId);
+  public void seekToPreviousMediaItem() throws RemoteException {
+    binder.seekToPreviousMediaItem(controllerId);
   }
 
-  public void seekToNextWindow() throws RemoteException {
-    binder.seekToNextWindow(controllerId);
+  public void seekToNextMediaItem() throws RemoteException {
+    binder.seekToNextMediaItem(controllerId);
   }
 
   public void seekToPrevious() throws RemoteException {

libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaSession.java

@@ -26,9 +26,9 @@ import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_AD
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_AD_INDEX_IN_AD_GROUP;
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_CUES;
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_LIVE_OFFSET;
+import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_MEDIA_ITEM_INDEX;
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_PERIOD_INDEX;
 import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_POSITION;
-import static androidx.media3.test.session.common.CommonConstants.KEY_CURRENT_WINDOW_INDEX;
 import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_INFO;
 import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_MUTED;
 import static androidx.media3.test.session.common.CommonConstants.KEY_DEVICE_VOLUME;
@@ -343,8 +343,8 @@ public class RemoteMediaSession {
       binder.setShuffleModeEnabled(sessionId, shuffleModeEnabled);
     }
 
-    public void setCurrentWindowIndex(int index) throws RemoteException {
-      binder.setCurrentWindowIndex(sessionId, index);
+    public void setCurrentMediaItemIndex(int index) throws RemoteException {
+      binder.setCurrentMediaItemIndex(sessionId, index);
     }
 
     public void setTrackSelectionParameters(TrackSelectionParameters parameters)
@@ -571,8 +571,8 @@ public class RemoteMediaSession {
       return this;
     }
 
-    public MockPlayerConfigBuilder setCurrentWindowIndex(int index) {
-      bundle.putInt(KEY_CURRENT_WINDOW_INDEX, index);
+    public MockPlayerConfigBuilder setCurrentMediaItemIndex(int index) {
+      bundle.putInt(KEY_CURRENT_MEDIA_ITEM_INDEX, index);
       return this;
     }