From 521871b9d5f79f9e326a2a812e87b141129d4540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Fri, 7 Feb 2025 14:24:47 +0100 Subject: [PATCH 1/5] Remove deprecated `Player.hasNext()` and `Player.hasNextWindow()` Use `Player.hasNextMediaItem()` instead. --- .../androidx/media3/common/BasePlayer.java | 18 -------------- .../media3/common/ForwardingPlayer.java | 24 ------------------- .../java/androidx/media3/common/Player.java | 14 ----------- .../media3/session/MediaController.java | 20 ---------------- .../media3/session/PlayerWrapper.java | 16 ------------- .../androidx/media3/session/MockPlayer.java | 18 -------------- 6 files changed, 110 deletions(-) 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 07268a9962..a7cbd3f7c8 100644 --- a/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java @@ -186,24 +186,6 @@ public abstract class BasePlayer implements Player { } } - /** - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @Deprecated - @Override - public final boolean hasNext() { - return hasNextMediaItem(); - } - - /** - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @Deprecated - @Override - public final boolean hasNextWindow() { - return hasNextMediaItem(); - } - @Override public final boolean hasNextMediaItem() { return getNextMediaItemIndex() != C.INDEX_UNSET; 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 477e59bfb8..353450af39 100644 --- a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java @@ -382,30 +382,6 @@ public class ForwardingPlayer implements Player { return player.getMaxSeekToPreviousPosition(); } - /** - * Calls {@link Player#hasNext()} on the delegate and returns the result. - * - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @SuppressWarnings("deprecation") // Forwarding to deprecated method - @Deprecated - @Override - public boolean hasNext() { - return player.hasNext(); - } - - /** - * Calls {@link Player#hasNextWindow()} on the delegate and returns the result. - * - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @SuppressWarnings("deprecation") // Forwarding to deprecated method - @Deprecated - @Override - public boolean hasNextWindow() { - return player.hasNextWindow(); - } - /** Calls {@link Player#hasNextMediaItem()} on the delegate and returns the result. */ @Override public boolean hasNextMediaItem() { 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 46ba91dda0..312106bcde 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Player.java +++ b/libraries/common/src/main/java/androidx/media3/common/Player.java @@ -2703,20 +2703,6 @@ public interface Player { */ void seekToPrevious(); - /** - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @UnstableApi - @Deprecated - boolean hasNext(); - - /** - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @UnstableApi - @Deprecated - boolean hasNextWindow(); - /** * Returns whether a next {@link MediaItem} exists, which may depend on the current repeat mode * and whether shuffle mode is enabled. 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 55579a3a8a..5ce87f2bfe 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java @@ -1537,26 +1537,6 @@ public class MediaController implements Player { return isConnected() ? impl.getNextMediaItemIndex() : C.INDEX_UNSET; } - /** - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @UnstableApi - @Deprecated - @Override - public final boolean hasNext() { - return hasNextMediaItem(); - } - - /** - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @UnstableApi - @Deprecated - @Override - public final boolean hasNextWindow() { - return hasNextMediaItem(); - } - @Override public final boolean hasPreviousMediaItem() { verifyApplicationThread(); 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 d1cc1e0ad4..673ebd84c8 100644 --- a/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java +++ b/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java @@ -618,22 +618,6 @@ import java.util.List; super.replaceMediaItems(fromIndex, toIndex, mediaItems); } - @SuppressWarnings("deprecation") // Forwarding deprecated call - @Deprecated - @Override - public boolean hasNext() { - verifyApplicationThread(); - return super.hasNext(); - } - - @SuppressWarnings("deprecation") // Forwarding deprecated call - @Deprecated - @Override - public boolean hasNextWindow() { - verifyApplicationThread(); - return super.hasNextWindow(); - } - @Override public boolean hasPreviousMediaItem() { 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 761c7c3273..b97b1c030e 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 @@ -1080,24 +1080,6 @@ public class MockPlayer implements Player { checkNotNull(conditionVariables.get(METHOD_REPLACE_MEDIA_ITEMS)).open(); } - /** - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @Deprecated - @Override - public boolean hasNext() { - throw new UnsupportedOperationException(); - } - - /** - * @deprecated Use {@link #hasNextMediaItem()} instead. - */ - @Deprecated - @Override - public boolean hasNextWindow() { - throw new UnsupportedOperationException(); - } - @Override public boolean hasPreviousMediaItem() { throw new UnsupportedOperationException(); From 72884c3bf34232c0109135264993100d764116a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Fri, 7 Feb 2025 14:28:47 +0100 Subject: [PATCH 2/5] Remove deprecated `Player.next()` Use `Player.seekToNextMediaItem()` instead. --- .../main/java/androidx/media3/common/BasePlayer.java | 9 --------- .../androidx/media3/common/ForwardingPlayer.java | 12 ------------ .../src/main/java/androidx/media3/common/Player.java | 7 ------- .../test/java/androidx/media3/common/PlayerTest.java | 9 +++++---- .../androidx/media3/session/MediaController.java | 10 ---------- .../java/androidx/media3/session/PlayerWrapper.java | 8 -------- .../java/androidx/media3/session/MockPlayer.java | 9 --------- 7 files changed, 5 insertions(+), 59 deletions(-) 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. */ From 26444098018ae595c7f5c8c1fedb21e9f5170105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Fri, 7 Feb 2025 14:33:15 +0100 Subject: [PATCH 3/5] Remove deprecated `Player.seekToPreviousWindow()` Use `Player.seekToPreviousMediaItem()` instead. --- .../main/java/androidx/media3/common/BasePlayer.java | 9 --------- .../androidx/media3/common/ForwardingPlayer.java | 12 ------------ .../src/main/java/androidx/media3/common/Player.java | 7 ------- .../androidx/media3/session/MediaController.java | 10 ---------- .../java/androidx/media3/session/PlayerWrapper.java | 8 -------- .../java/androidx/media3/session/MockPlayer.java | 9 --------- 6 files changed, 55 deletions(-) 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 93387fbfe1..cdba0365d0 100644 --- a/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java @@ -151,15 +151,6 @@ public abstract class BasePlayer implements Player { return getPreviousMediaItemIndex() != C.INDEX_UNSET; } - /** - * @deprecated Use {@link #seekToPreviousMediaItem()} instead. - */ - @Deprecated - @Override - public final void seekToPreviousWindow() { - seekToPreviousMediaItem(); - } - @Override public final void seekToPreviousMediaItem() { seekToPreviousMediaItemInternal(Player.COMMAND_SEEK_TO_PREVIOUS_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 9b62c46e44..868fc00863 100644 --- a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java +++ b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java @@ -352,18 +352,6 @@ public class ForwardingPlayer implements Player { return player.hasPreviousMediaItem(); } - /** - * Calls {@link Player#seekToPreviousWindow()} on the delegate. - * - * @deprecated Use {@link #seekToPreviousMediaItem()} instead. - */ - @SuppressWarnings("deprecation") // Forwarding to deprecated method - @Deprecated - @Override - public void seekToPreviousWindow() { - player.seekToPreviousWindow(); - } - /** Calls {@link Player#seekToPreviousMediaItem()} on the delegate. */ @Override public void seekToPreviousMediaItem() { 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 0cc72c691a..dad27684d7 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Player.java +++ b/libraries/common/src/main/java/androidx/media3/common/Player.java @@ -2648,13 +2648,6 @@ public interface Player { */ boolean hasPreviousMediaItem(); - /** - * @deprecated Use {@link #seekToPreviousMediaItem()} instead. - */ - @UnstableApi - @Deprecated - void seekToPreviousWindow(); - /** * Seeks to the default position of the previous {@link MediaItem}, which may depend on the * current repeat mode and whether shuffle mode is enabled. Does nothing if {@link 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 4ecec1d458..a813edc3ff 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 #seekToPreviousMediaItem()} instead. - */ - @UnstableApi - @Deprecated - @Override - public final void seekToPreviousWindow() { - seekToPreviousMediaItem(); - } - /** * {@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 d23e9fb63f..333f6720c4 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 seekToPreviousWindow() { - verifyApplicationThread(); - super.seekToPreviousWindow(); - } - @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 2a2fd835b1..5da4a0b5c4 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 #seekToPreviousMediaItem()} instead. - */ - @Deprecated - @Override - public void seekToPreviousWindow() { - throw new UnsupportedOperationException(); - } - /** * @deprecated Use {@link #seekToNextMediaItem()} instead. */ From 0a648200ba625441e6150b7109a452dc52bcf6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Fri, 7 Feb 2025 14:37:52 +0100 Subject: [PATCH 4/5] Remove deprecated `Player.seekToNextWindow()` Use `Player.seekToNextMediaItem()` instead. --- .../main/java/androidx/media3/common/BasePlayer.java | 9 --------- .../androidx/media3/common/ForwardingPlayer.java | 12 ------------ .../src/main/java/androidx/media3/common/Player.java | 7 ------- .../test/java/androidx/media3/common/PlayerTest.java | 6 +++--- .../androidx/media3/session/MediaController.java | 10 ---------- .../java/androidx/media3/session/PlayerWrapper.java | 8 -------- .../java/androidx/media3/session/MockPlayer.java | 9 --------- 7 files changed, 3 insertions(+), 58 deletions(-) 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(); From d0ca20184eff29d1cd7b4aec334d83eb7dbd0452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Fri, 7 Feb 2025 14:43:41 +0100 Subject: [PATCH 5/5] Update RELEASENOTES.md --- RELEASENOTES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index c78e8678fc..017200a4b0 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -49,6 +49,12 @@ * Test Utilities: * Demo app: * Remove deprecated symbols: + * Removed deprecated `Player.hasNext()`, `Player.hasNextWindow()`. Use + `Player.hasNextMediaItem()` instead. + * Removed deprecated `Player.next()`. Use `Player.seekToNextMediaItem()` instead. + * Removed deprecated `Player.seekToPreviousWindow()`. Use `Player.seekToPreviousMediaItem()` + instead. + * Removed deprecated `Player.seekToNextWindow()`. Use `Player.seekToNextMediaItem()` instead. ## 1.6