diff --git a/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java b/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java index cdba0365d0..cada60d5f1 100644 --- a/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java @@ -182,15 +182,6 @@ public abstract class BasePlayer implements Player { return getNextMediaItemIndex() != C.INDEX_UNSET; } - /** - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @Deprecated - @Override - public final void seekToNextWindow() { - seekToNextMediaItem(); - } - @Override public final void seekToNextMediaItem() { seekToNextMediaItemInternal(Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM); diff --git a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java index 868fc00863..153ff612af 100644 --- a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java @@ -376,18 +376,6 @@ public class ForwardingPlayer implements Player { return player.hasNextMediaItem(); } - /** - * Calls {@link Player#seekToNextWindow()} on the delegate. - * - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @SuppressWarnings("deprecation") // Forwarding to deprecated method - @Deprecated - @Override - public void seekToNextWindow() { - player.seekToNextWindow(); - } - /** Calls {@link Player#seekToNextMediaItem()} on the delegate. */ @Override public void seekToNextMediaItem() { diff --git a/libraries/common/src/main/java/androidx/media3/common/Player.java b/libraries/common/src/main/java/androidx/media3/common/Player.java index dad27684d7..ab96a26967 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Player.java +++ b/libraries/common/src/main/java/androidx/media3/common/Player.java @@ -2709,13 +2709,6 @@ public interface Player { */ boolean hasNextMediaItem(); - /** - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @UnstableApi - @Deprecated - void seekToNextWindow(); - /** * Seeks to the default position of the next {@link MediaItem}, which may depend on the current * repeat mode and whether shuffle mode is enabled. Does nothing if {@link #hasNextMediaItem()} is diff --git a/libraries/common/src/test/java/androidx/media3/common/PlayerTest.java b/libraries/common/src/test/java/androidx/media3/common/PlayerTest.java index 2fc747fd40..f61449e98b 100644 --- a/libraries/common/src/test/java/androidx/media3/common/PlayerTest.java +++ b/libraries/common/src/test/java/androidx/media3/common/PlayerTest.java @@ -31,12 +31,12 @@ public class PlayerTest { * This test picks a method on the {@link Player} interface that is known will never be * stabilised, and asserts that it is required to be implemented (therefore enforcing that {@link * Player} is unstable-for-implementors). If this test fails because the {@link - * Player#seekToNextWindow()} method is removed, it should be replaced with an equivalent + * Player#getCurrentWindowIndex()} method is removed, it should be replaced with an equivalent * unstable, unimplemented method. */ @Test public void testAtLeastOneUnstableUnimplementedMethodExists() throws Exception { - Method seekToNextWindowMethod = Player.class.getMethod("seekToNextWindow"); - assertThat(seekToNextWindowMethod.isDefault()).isFalse(); + Method getCurrentWindowIndexMethod = Player.class.getMethod("getCurrentWindowIndex"); + assertThat(getCurrentWindowIndexMethod.isDefault()).isFalse(); } } diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaController.java b/libraries/session/src/main/java/androidx/media3/session/MediaController.java index a813edc3ff..8826cbfbd8 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java @@ -1565,16 +1565,6 @@ public class MediaController implements Player { impl.seekToPreviousMediaItem(); } - /** - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @UnstableApi - @Deprecated - @Override - public final void seekToNextWindow() { - seekToNextMediaItem(); - } - /** * {@inheritDoc} * diff --git a/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java b/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java index 333f6720c4..70713b19bd 100644 --- a/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java +++ b/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java @@ -630,14 +630,6 @@ import java.util.List; return super.hasNextMediaItem(); } - @SuppressWarnings("deprecation") // Forwarding deprecated call - @Deprecated - @Override - public void seekToNextWindow() { - verifyApplicationThread(); - super.seekToNextWindow(); - } - @Override public void seekToPreviousMediaItem() { verifyApplicationThread(); diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java index 5da4a0b5c4..acf7aeff3d 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java @@ -1090,15 +1090,6 @@ public class MockPlayer implements Player { throw new UnsupportedOperationException(); } - /** - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @Deprecated - @Override - public void seekToNextWindow() { - throw new UnsupportedOperationException(); - } - @Override public void seekToPreviousMediaItem() { checkNotNull(conditionVariables.get(METHOD_SEEK_TO_PREVIOUS_MEDIA_ITEM)).open();