Mark convenience methods as final in BasePlayer

PiperOrigin-RevId: 359021944

library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java

@@ -30,44 +30,44 @@ public abstract class BasePlayer implements Player {
   }
 
   @Override
-  public void setMediaItem(MediaItem mediaItem) {
+  public final void setMediaItem(MediaItem mediaItem) {
     setMediaItems(Collections.singletonList(mediaItem));
   }
 
   @Override
-  public void setMediaItem(MediaItem mediaItem, long startPositionMs) {
+  public final void setMediaItem(MediaItem mediaItem, long startPositionMs) {
     setMediaItems(Collections.singletonList(mediaItem), /* startWindowIndex= */ 0, startPositionMs);
   }
 
   @Override
-  public void setMediaItem(MediaItem mediaItem, boolean resetPosition) {
+  public final void setMediaItem(MediaItem mediaItem, boolean resetPosition) {
     setMediaItems(Collections.singletonList(mediaItem), resetPosition);
   }
 
   @Override
-  public void setMediaItems(List<MediaItem> mediaItems) {
+  public final void setMediaItems(List<MediaItem> mediaItems) {
     setMediaItems(mediaItems, /* resetPosition= */ true);
   }
 
   @Override
-  public void addMediaItem(int index, MediaItem mediaItem) {
+  public final void addMediaItem(int index, MediaItem mediaItem) {
     addMediaItems(index, Collections.singletonList(mediaItem));
   }
 
   @Override
-  public void addMediaItem(MediaItem mediaItem) {
+  public final void addMediaItem(MediaItem mediaItem) {
     addMediaItems(Collections.singletonList(mediaItem));
   }
 
   @Override
-  public void moveMediaItem(int currentIndex, int newIndex) {
+  public final void moveMediaItem(int currentIndex, int newIndex) {
     if (currentIndex != newIndex) {
       moveMediaItems(/* fromIndex= */ currentIndex, /* toIndex= */ currentIndex + 1, newIndex);
     }
   }
 
   @Override
-  public void removeMediaItem(int index) {
+  public final void removeMediaItem(int index) {
     removeMediaItems(/* fromIndex= */ index, /* toIndex= */ index + 1);
   }
 
@@ -188,12 +188,12 @@ public abstract class BasePlayer implements Player {
   }
 
   @Override
-  public int getMediaItemCount() {
+  public final int getMediaItemCount() {
     return getCurrentTimeline().getWindowCount();
   }
 
   @Override
-  public MediaItem getMediaItemAt(int index) {
+  public final MediaItem getMediaItemAt(int index) {
     return getCurrentTimeline().getWindow(index, window).mediaItem;
   }
 

library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java

@@ -1294,13 +1294,6 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
-  public void setMediaItems(List<MediaItem> mediaItems) {
-    verifyApplicationThread();
-    analyticsCollector.resetForNewPlaylist();
-    player.setMediaItems(mediaItems);
-  }
-
-  @Override
   public void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition) {
     verifyApplicationThread();
     analyticsCollector.resetForNewPlaylist();
@@ -1316,27 +1309,6 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
-  public void setMediaItem(MediaItem mediaItem) {
-    verifyApplicationThread();
-    analyticsCollector.resetForNewPlaylist();
-    player.setMediaItem(mediaItem);
-  }
-
-  @Override
-  public void setMediaItem(MediaItem mediaItem, boolean resetPosition) {
-    verifyApplicationThread();
-    analyticsCollector.resetForNewPlaylist();
-    player.setMediaItem(mediaItem, resetPosition);
-  }
-
-  @Override
-  public void setMediaItem(MediaItem mediaItem, long startPositionMs) {
-    verifyApplicationThread();
-    analyticsCollector.resetForNewPlaylist();
-    player.setMediaItem(mediaItem, startPositionMs);
-  }
-
-  @Override
   public void setMediaSources(List<MediaSource> mediaSources) {
     verifyApplicationThread();
     analyticsCollector.resetForNewPlaylist();
@@ -1392,18 +1364,6 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
-  public void addMediaItem(MediaItem mediaItem) {
-    verifyApplicationThread();
-    player.addMediaItem(mediaItem);
-  }
-
-  @Override
-  public void addMediaItem(int index, MediaItem mediaItem) {
-    verifyApplicationThread();
-    player.addMediaItem(index, mediaItem);
-  }
-
-  @Override
   public void addMediaSource(MediaSource mediaSource) {
     verifyApplicationThread();
     player.addMediaSource(mediaSource);
@@ -1428,24 +1388,12 @@ public class SimpleExoPlayer extends BasePlayer
   }
 
   @Override
-  public void moveMediaItem(int currentIndex, int newIndex) {
-    verifyApplicationThread();
-    player.moveMediaItem(currentIndex, newIndex);
-  }
-
-  @Override
   public void moveMediaItems(int fromIndex, int toIndex, int newIndex) {
     verifyApplicationThread();
     player.moveMediaItems(fromIndex, toIndex, newIndex);
   }
 
   @Override
-  public void removeMediaItem(int index) {
-    verifyApplicationThread();
-    player.removeMediaItem(index);
-  }
-
-  @Override
   public void removeMediaItems(int fromIndex, int toIndex) {
     verifyApplicationThread();
     player.removeMediaItems(fromIndex, toIndex);

testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java

@@ -151,26 +151,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   }
 
   @Override
-  public void setMediaItem(MediaItem mediaItem) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void setMediaItem(MediaItem mediaItem, long startPositionMs) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void setMediaItem(MediaItem mediaItem, boolean resetPosition) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void setMediaItems(List<MediaItem> mediaItems) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
   public void setMediaItems(List<MediaItem> mediaItems, boolean resetPosition) {
     throw new UnsupportedOperationException();
   }
@@ -213,16 +193,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   }
 
   @Override
-  public void addMediaItem(MediaItem mediaItem) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void addMediaItem(int index, MediaItem mediaItem) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
   public void addMediaItems(List<MediaItem> mediaItems) {
     throw new UnsupportedOperationException();
   }
@@ -253,21 +223,11 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
   }
 
   @Override
-  public void moveMediaItem(int currentIndex, int newIndex) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
   public void moveMediaItems(int fromIndex, int toIndex, int newIndex) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public void removeMediaItem(int index) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
   public void removeMediaItems(int fromIndex, int toIndex) {
     throw new UnsupportedOperationException();
   }