diff --git a/RELEASENOTES.md b/RELEASENOTES.md index db85258240..e3a79cc3d9 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,6 +3,9 @@ ### dev-v2 (not yet released) * Remove deprecated symbols: + * Remove `Player.getPlaybackError`. Use `Player.getPlayerError` instead. + * Remove `Player.getCurrentTag`. Use `Player.getCurrentMediaItem` and + `MediaIteam.PlaybackProperties.tag` instead. * Remove `PlaybackPreparer`. UI components that previously had `setPlaybackPreparer` methods will now call `Player.prepare` by default. If this behavior is sufficient, use of `PlaybackPreparer` can be removed diff --git a/library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java index 57550d589b..4ef055e9ad 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java @@ -86,14 +86,6 @@ public abstract class BasePlayer implements Player { return getAvailableCommands().contains(command); } - /** @deprecated Use {@link #getPlayerError()} instead. */ - @Deprecated - @Override - @Nullable - public final ExoPlaybackException getPlaybackError() { - return getPlayerError(); - } - @Override public final void play() { setPlayWhenReady(true); @@ -180,24 +172,6 @@ public abstract class BasePlayer implements Player { getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled()); } - /** - * @deprecated Use {@link #getCurrentMediaItem()} and {@link MediaItem.PlaybackProperties#tag} - * instead. - */ - @Deprecated - @Override - @Nullable - public final Object getCurrentTag() { - Timeline timeline = getCurrentTimeline(); - if (timeline.isEmpty()) { - return null; - } - @Nullable - MediaItem.PlaybackProperties playbackProperties = - timeline.getWindow(getCurrentWindowIndex(), window).mediaItem.playbackProperties; - return playbackProperties != null ? playbackProperties.tag : null; - } - @Override @Nullable public final MediaItem getCurrentMediaItem() { diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Player.java b/library/common/src/main/java/com/google/android/exoplayer2/Player.java index aa0963ac9a..9fd3dd7f93 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/Player.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/Player.java @@ -1337,11 +1337,6 @@ public interface Player { @Nullable ExoPlaybackException getPlayerError(); - /** @deprecated Use {@link #getPlayerError()} instead. */ - @Deprecated - @Nullable - ExoPlaybackException getPlaybackError(); - /** * Resumes playback as soon as {@link #getPlaybackState()} == {@link #STATE_READY}. Equivalent to * {@code setPlayWhenReady(true)}. @@ -1630,14 +1625,6 @@ public interface Player { */ int getPreviousWindowIndex(); - /** - * @deprecated Use {@link #getCurrentMediaItem()} and {@link MediaItem.PlaybackProperties#tag} - * instead. - */ - @Deprecated - @Nullable - Object getCurrentTag(); - /** * Returns the media item of the current window in the timeline. May be null if the timeline is * empty.