diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e1d44e718b..91bbfcbe6c 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -57,8 +57,10 @@ * Use `HttpEngineDataSource` as the `HttpDataSource` when supported by the device. * Remove deprecated symbols: - * Remove deprecated `Player#hasPrevious` method. Use - `Player#hasPreviousMediaItem()` instead. + * Remove deprecated `Player.hasPrevious`, `Player.hasPreviousWindow()`. + Use `Player.hasPreviousMediaItem()` instead. + * Remove deprecated `Player.previous()`method. Use + `Player.seekToPreviousMediaItem()` instead. * Remove deprecated `DrmSessionEventListener.onDrmSessionAcquired` method. ## 1.4 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 7b4edba10f..2405280229 100644 --- a/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java @@ -147,29 +147,11 @@ public abstract class BasePlayer implements Player { seekToOffset(getSeekForwardIncrement(), Player.COMMAND_SEEK_FORWARD); } - /** - * @deprecated Use {@link #hasPreviousMediaItem()} instead. - */ - @Deprecated - @Override - public final boolean hasPreviousWindow() { - return hasPreviousMediaItem(); - } - @Override public final boolean hasPreviousMediaItem() { return getPreviousMediaItemIndex() != C.INDEX_UNSET; } - /** - * @deprecated Use {@link #seekToPreviousMediaItem()} instead. - */ - @Deprecated - @Override - public final void previous() { - seekToPreviousMediaItem(); - } - /** * @deprecated Use {@link #seekToPreviousMediaItem()} 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 23d85f4737..bd54362617 100644 --- a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java @@ -327,36 +327,12 @@ public class ForwardingPlayer implements Player { player.seekForward(); } - /** - * Calls {@link Player#hasPreviousWindow()} on the delegate and returns the result. - * - * @deprecated Use {@link #hasPreviousMediaItem()} instead. - */ - @SuppressWarnings("deprecation") // Forwarding to deprecated method - @Deprecated - @Override - public boolean hasPreviousWindow() { - return player.hasPreviousWindow(); - } - /** Calls {@link Player#hasPreviousMediaItem()} on the delegate and returns the result. */ @Override public boolean hasPreviousMediaItem() { return player.hasPreviousMediaItem(); } - /** - * Calls {@link Player#previous()} on the delegate. - * - * @deprecated Use {@link #seekToPreviousMediaItem()} instead. - */ - @SuppressWarnings("deprecation") // Forwarding to deprecated method - @Deprecated - @Override - public void previous() { - player.previous(); - } - /** * Calls {@link Player#seekToPreviousWindow()} 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 add2881769..da8930e07c 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Player.java +++ b/libraries/common/src/main/java/androidx/media3/common/Player.java @@ -2635,13 +2635,6 @@ public interface Player { */ void seekForward(); - /** - * @deprecated Use {@link #hasPreviousMediaItem()} instead. - */ - @UnstableApi - @Deprecated - boolean hasPreviousWindow(); - /** * Returns whether a previous media item exists, which may depend on the current repeat mode and * whether shuffle mode is enabled. @@ -2655,13 +2648,6 @@ public interface Player { */ boolean hasPreviousMediaItem(); - /** - * @deprecated Use {@link #seekToPreviousMediaItem()} instead. - */ - @UnstableApi - @Deprecated - void previous(); - /** * @deprecated Use {@link #seekToPreviousMediaItem()} instead. */ 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 38f96e213d..fff4f1cd5f 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java @@ -1437,16 +1437,6 @@ public class MediaController implements Player { return hasNextMediaItem(); } - /** - * @deprecated Use {@link #hasPreviousMediaItem()} instead. - */ - @UnstableApi - @Deprecated - @Override - public final boolean hasPreviousWindow() { - return hasPreviousMediaItem(); - } - /** * @deprecated Use {@link #hasNextMediaItem()} instead. */ @@ -1469,16 +1459,6 @@ public class MediaController implements Player { return isConnected() && impl.hasNextMediaItem(); } - /** - * @deprecated Use {@link #seekToPreviousMediaItem()} instead. - */ - @UnstableApi - @Deprecated - @Override - public final void previous() { - seekToPreviousMediaItem(); - } - /** * @deprecated Use {@link #seekToNextMediaItem()} 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 db99b29e46..71f0ad9cd4 100644 --- a/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java +++ b/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java @@ -565,14 +565,6 @@ import java.util.List; return super.hasNext(); } - @SuppressWarnings("deprecation") // Forwarding deprecated call - @Deprecated - @Override - public boolean hasPreviousWindow() { - verifyApplicationThread(); - return super.hasPreviousWindow(); - } - @SuppressWarnings("deprecation") // Forwarding deprecated call @Deprecated @Override @@ -593,14 +585,6 @@ import java.util.List; return super.hasNextMediaItem(); } - @SuppressWarnings("deprecation") // Forwarding deprecated call - @Deprecated - @Override - public void previous() { - verifyApplicationThread(); - super.previous(); - } - @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 b5b81e179e..2d5a5f4e92 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 @@ -1089,15 +1089,6 @@ public class MockPlayer implements Player { throw new UnsupportedOperationException(); } - /** - * @deprecated Use {@link #hasPreviousMediaItem()} instead. - */ - @Deprecated - @Override - public boolean hasPreviousWindow() { - throw new UnsupportedOperationException(); - } - /** * @deprecated Use {@link #hasNextMediaItem()} instead. */ @@ -1117,15 +1108,6 @@ public class MockPlayer implements Player { throw new UnsupportedOperationException(); } - /** - * @deprecated Use {@link #seekToPreviousMediaItem()} instead. - */ - @Deprecated - @Override - public void previous() { - throw new UnsupportedOperationException(); - } - /** * @deprecated Use {@link #seekToNextMediaItem()} instead. */