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 a7cbd3f7c8..93387fbfe1 100644 --- a/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java @@ -191,15 +191,6 @@ public abstract class BasePlayer implements Player { return getNextMediaItemIndex() != C.INDEX_UNSET; } - /** - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @Deprecated - @Override - public final void next() { - seekToNextMediaItem(); - } - /** * @deprecated Use {@link #seekToNextMediaItem()} instead. */ 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 353450af39..9b62c46e44 100644 --- a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java @@ -388,18 +388,6 @@ public class ForwardingPlayer implements Player { return player.hasNextMediaItem(); } - /** - * Calls {@link Player#next()} on the delegate. - * - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @SuppressWarnings("deprecation") // Forwarding to deprecated method - @Deprecated - @Override - public void next() { - player.next(); - } - /** * Calls {@link Player#seekToNextWindow()} on the delegate. * 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 312106bcde..0cc72c691a 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Player.java +++ b/libraries/common/src/main/java/androidx/media3/common/Player.java @@ -2716,13 +2716,6 @@ public interface Player { */ boolean hasNextMediaItem(); - /** - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @UnstableApi - @Deprecated - void next(); - /** * @deprecated Use {@link #seekToNextMediaItem()} instead. */ 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 efd252e267..2fc747fd40 100644 --- a/libraries/common/src/test/java/androidx/media3/common/PlayerTest.java +++ b/libraries/common/src/test/java/androidx/media3/common/PlayerTest.java @@ -30,12 +30,13 @@ 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#next()} - * method is removed, it should be replaced with an equivalent unstable, unimplemented method. + * Player} is unstable-for-implementors). If this test fails because the {@link + * Player#seekToNextWindow()} method is removed, it should be replaced with an equivalent + * unstable, unimplemented method. */ @Test public void testAtLeastOneUnstableUnimplementedMethodExists() throws Exception { - Method nextMethod = Player.class.getMethod("next"); - assertThat(nextMethod.isDefault()).isFalse(); + Method seekToNextWindowMethod = Player.class.getMethod("seekToNextWindow"); + assertThat(seekToNextWindowMethod.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 5ce87f2bfe..4ecec1d458 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java @@ -1549,16 +1549,6 @@ public class MediaController implements Player { return isConnected() && impl.hasNextMediaItem(); } - /** - * @deprecated Use {@link #seekToNextMediaItem()} instead. - */ - @UnstableApi - @Deprecated - @Override - public final void next() { - seekToNextMediaItem(); - } - /** * @deprecated Use {@link #seekToPreviousMediaItem()} instead. */ 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 673ebd84c8..d23e9fb63f 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 next() { - verifyApplicationThread(); - super.next(); - } - @SuppressWarnings("deprecation") // Forwarding deprecated call @Deprecated @Override 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 b97b1c030e..2a2fd835b1 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 next() { - throw new UnsupportedOperationException(); - } - /** * @deprecated Use {@link #seekToPreviousMediaItem()} instead. */