From c046f40fd0f57b0774722ebc9cde0a95b1e1259b Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 12 Nov 2021 10:18:26 +0000 Subject: [PATCH] Fixes for some minor misc issues - Unnecessary deprecation suppressions - Dead code - Broken Javadoc PiperOrigin-RevId: 409357884 --- .../test/java/androidx/media3/cast/CastPlayerTest.java | 1 - .../src/main/java/androidx/media3/common/text/Cue.java | 1 - .../androidx/media3/exoplayer/DefaultLoadControl.java | 1 - .../androidx/media3/exoplayer/SimpleExoPlayer.java | 2 -- .../session/MediaControllerSurfaceSizeChangeTest.java | 5 ++--- .../androidx/media3/session/RemoteMediaBrowser.java | 10 ++-------- .../androidx/media3/session/RemoteMediaController.java | 2 +- .../java/androidx/media3/ui/PlayerControlView.java | 1 - .../media3/ui/leanback/LeanbackPlayerAdapter.java | 2 -- 9 files changed, 5 insertions(+), 20 deletions(-) diff --git a/libraries/cast/src/test/java/androidx/media3/cast/CastPlayerTest.java b/libraries/cast/src/test/java/androidx/media3/cast/CastPlayerTest.java index b553a2e8f3..b681508ff9 100644 --- a/libraries/cast/src/test/java/androidx/media3/cast/CastPlayerTest.java +++ b/libraries/cast/src/test/java/androidx/media3/cast/CastPlayerTest.java @@ -392,7 +392,6 @@ public class CastPlayerTest { assertThat(mediaQueueItems[1].getMedia().getContentId()).isEqualTo(uri2); } - @SuppressWarnings("deprecation") // Verifies deprecated callback being called correctly. @Test public void setMediaItems_replaceExistingPlaylist_notifiesMediaItemTransition() { List firstPlaylist = new ArrayList<>(); diff --git a/libraries/common/src/main/java/androidx/media3/common/text/Cue.java b/libraries/common/src/main/java/androidx/media3/common/text/Cue.java index 6dddc14d36..11574e88ed 100644 --- a/libraries/common/src/main/java/androidx/media3/common/text/Cue.java +++ b/libraries/common/src/main/java/androidx/media3/common/text/Cue.java @@ -366,7 +366,6 @@ public final class Cue implements Bundleable { * @deprecated Use {@link Builder}. */ @UnstableApi - @SuppressWarnings("deprecation") @Deprecated public Cue( CharSequence text, diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DefaultLoadControl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DefaultLoadControl.java index c0bf98f1ac..468532b0c0 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DefaultLoadControl.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DefaultLoadControl.java @@ -265,7 +265,6 @@ public class DefaultLoadControl implements LoadControl { private boolean isLoading; /** Constructs a new instance, using the {@code DEFAULT_*} constants defined in this class. */ - @SuppressWarnings("deprecation") public DefaultLoadControl() { this( new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE), diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java index a4f383d507..ed8ee0d4a1 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java @@ -407,7 +407,6 @@ public class SimpleExoPlayer extends BasePlayer /** @deprecated Use the {@link ExoPlayer.Builder}. */ @Deprecated - @SuppressWarnings("deprecation") protected SimpleExoPlayer( Context context, RenderersFactory renderersFactory, @@ -439,7 +438,6 @@ public class SimpleExoPlayer extends BasePlayer } /** @param builder The {@link ExoPlayer.Builder} to obtain all construction parameters. */ - @SuppressWarnings("deprecation") /* package */ SimpleExoPlayer(ExoPlayer.Builder builder) { constructorFinished = new ConditionVariable(); try { diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerSurfaceSizeChangeTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerSurfaceSizeChangeTest.java index b80e7b55ab..c1594868ca 100644 --- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerSurfaceSizeChangeTest.java +++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerSurfaceSizeChangeTest.java @@ -52,9 +52,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; /** - * A class that tests whether {@link MediaController.Listener#onSurfaceSizeChanged(int, int)} is - * called when calling {@link MediaController#setVideoSurface(Surface)} and other surface related - * methods. + * A class that tests whether {@link Player.Listener#onSurfaceSizeChanged(int, int)} is called when + * calling {@link MediaController#setVideoSurface(Surface)} and other surface related methods. */ @RunWith(Parameterized.class) @LargeTest diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowser.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowser.java index 307d891b40..98cb9f3111 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowser.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaBrowser.java @@ -96,14 +96,8 @@ public class RemoteMediaBrowser extends RemoteMediaController { // Non-public methods //////////////////////////////////////////////////////////////////////////////// - /** - * Create a {@link MediaBrowser} in the client app. Should be used after successful connection - * through {@link #connect()}. - * - * @param connectionHints connection hints - * @param waitForConnection true if this method needs to wait for the connection, - */ - void create(SessionToken token, Bundle connectionHints, boolean waitForConnection) + @Override + protected void create(SessionToken token, Bundle connectionHints, boolean waitForConnection) throws RemoteException { binder.create( /* isBrowser= */ true, controllerId, token.toBundle(), connectionHints, waitForConnection); diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java index 96747ad718..16676e0e78 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/RemoteMediaController.java @@ -340,7 +340,7 @@ public class RemoteMediaController { * @param connectionHints connection hints * @param waitForConnection true if this method needs to wait for the connection, */ - void create(SessionToken token, Bundle connectionHints, boolean waitForConnection) + protected void create(SessionToken token, Bundle connectionHints, boolean waitForConnection) throws RemoteException { binder.create( /* isBrowser= */ false, controllerId, token.toBundle(), connectionHints, waitForConnection); diff --git a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java index 46d7c9d7f2..d087478b39 100644 --- a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java +++ b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java @@ -1224,7 +1224,6 @@ public class PlayerControlView extends FrameLayout { } } - @SuppressWarnings("deprecation") private void dispatchPlay(Player player) { @State int state = player.getPlaybackState(); if (state == Player.STATE_IDLE) { diff --git a/libraries/ui_leanback/src/main/java/androidx/media3/ui/leanback/LeanbackPlayerAdapter.java b/libraries/ui_leanback/src/main/java/androidx/media3/ui/leanback/LeanbackPlayerAdapter.java index e08a1f0909..77d25ce9dc 100644 --- a/libraries/ui_leanback/src/main/java/androidx/media3/ui/leanback/LeanbackPlayerAdapter.java +++ b/libraries/ui_leanback/src/main/java/androidx/media3/ui/leanback/LeanbackPlayerAdapter.java @@ -136,8 +136,6 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab return player.getPlaybackState() == Player.STATE_IDLE ? -1 : player.getCurrentPosition(); } - // Calls deprecated method to provide backwards compatibility. - @SuppressWarnings("deprecation") @Override public void play() { if (player.getPlaybackState() == Player.STATE_IDLE) {