Skip to content

SDK / exoplayer

Go to a project
Commit 7b9eaaed by ibaker Committed by Ian Baker
Options

Fix ForwardingPlayer @Override and @Deprecated annotations 

These were messed up in https://github.com/androidx/media/commit/74c6ef9ba096fe64e767a739b97debca5185a375

Also suppress deprecation warnings when we're just forwarding a
deprecated method to the delegate.

#minor-release

PiperOrigin-RevId: 426351791
parent 37d47e1d
Inline Side-by-side
Showing with 21 additions and 2 deletions
libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java
...@@ -39,12 +39,12 @@ public class ForwardingPlayer implements Player { ...@@ -39,12 +39,12 @@ public class ForwardingPlayer implements Player {
this.player = player; this.player = player;
} }
@Deprecated @Override
public Looper getApplicationLooper() { public Looper getApplicationLooper() {
return player.getApplicationLooper(); return player.getApplicationLooper();
} }
@Deprecated @Override
public void addListener(Listener listener) { public void addListener(Listener listener) {
player.addListener(new ForwardingListener(this, listener)); player.addListener(new ForwardingListener(this, listener));
} }
...@@ -255,12 +255,14 @@ public class ForwardingPlayer implements Player { ...@@ -255,12 +255,14 @@ public class ForwardingPlayer implements Player {
player.seekForward(); player.seekForward();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean hasPrevious() { public boolean hasPrevious() {
return player.hasPrevious(); return player.hasPrevious();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean hasPreviousWindow() { public boolean hasPreviousWindow() {
...@@ -272,12 +274,14 @@ public class ForwardingPlayer implements Player { ...@@ -272,12 +274,14 @@ public class ForwardingPlayer implements Player {
return player.hasPreviousMediaItem(); return player.hasPreviousMediaItem();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void previous() { public void previous() {
player.previous(); player.previous();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void seekToPreviousWindow() { public void seekToPreviousWindow() {
...@@ -299,12 +303,14 @@ public class ForwardingPlayer implements Player { ...@@ -299,12 +303,14 @@ public class ForwardingPlayer implements Player {
return player.getMaxSeekToPreviousPosition(); return player.getMaxSeekToPreviousPosition();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean hasNext() { public boolean hasNext() {
return player.hasNext(); return player.hasNext();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean hasNextWindow() { public boolean hasNextWindow() {
...@@ -316,12 +322,14 @@ public class ForwardingPlayer implements Player { ...@@ -316,12 +322,14 @@ public class ForwardingPlayer implements Player {
return player.hasNextMediaItem(); return player.hasNextMediaItem();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void next() { public void next() {
player.next(); player.next();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void seekToNextWindow() { public void seekToNextWindow() {
...@@ -358,6 +366,7 @@ public class ForwardingPlayer implements Player { ...@@ -358,6 +366,7 @@ public class ForwardingPlayer implements Player {
player.stop(); player.stop();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public void stop(boolean reset) { public void stop(boolean reset) {
...@@ -369,11 +378,15 @@ public class ForwardingPlayer implements Player { ...@@ -369,11 +378,15 @@ public class ForwardingPlayer implements Player {
player.release(); player.release();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated
@Override @Override
public TrackGroupArray getCurrentTrackGroups() { public TrackGroupArray getCurrentTrackGroups() {
return player.getCurrentTrackGroups(); return player.getCurrentTrackGroups();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated
@Override @Override
public TrackSelectionArray getCurrentTrackSelections() { public TrackSelectionArray getCurrentTrackSelections() {
return player.getCurrentTrackSelections(); return player.getCurrentTrackSelections();
...@@ -425,6 +438,7 @@ public class ForwardingPlayer implements Player { ...@@ -425,6 +438,7 @@ public class ForwardingPlayer implements Player {
return player.getCurrentPeriodIndex(); return player.getCurrentPeriodIndex();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public int getCurrentWindowIndex() { public int getCurrentWindowIndex() {
...@@ -436,6 +450,7 @@ public class ForwardingPlayer implements Player { ...@@ -436,6 +450,7 @@ public class ForwardingPlayer implements Player {
return player.getCurrentMediaItemIndex(); return player.getCurrentMediaItemIndex();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public int getNextWindowIndex() { public int getNextWindowIndex() {
...@@ -447,6 +462,7 @@ public class ForwardingPlayer implements Player { ...@@ -447,6 +462,7 @@ public class ForwardingPlayer implements Player {
return player.getNextMediaItemIndex(); return player.getNextMediaItemIndex();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public int getPreviousWindowIndex() { public int getPreviousWindowIndex() {
...@@ -499,6 +515,7 @@ public class ForwardingPlayer implements Player { ...@@ -499,6 +515,7 @@ public class ForwardingPlayer implements Player {
return player.getTotalBufferedDuration(); return player.getTotalBufferedDuration();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean isCurrentWindowDynamic() { public boolean isCurrentWindowDynamic() {
...@@ -510,6 +527,7 @@ public class ForwardingPlayer implements Player { ...@@ -510,6 +527,7 @@ public class ForwardingPlayer implements Player {
return player.isCurrentMediaItemDynamic(); return player.isCurrentMediaItemDynamic();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean isCurrentWindowLive() { public boolean isCurrentWindowLive() {
...@@ -526,6 +544,7 @@ public class ForwardingPlayer implements Player { ...@@ -526,6 +544,7 @@ public class ForwardingPlayer implements Player {
return player.getCurrentLiveOffset(); return player.getCurrentLiveOffset();
} }
@SuppressWarnings("deprecation") // Forwarding to deprecated method
@Deprecated @Deprecated
@Override @Override
public boolean isCurrentWindowSeekable() { public boolean isCurrentWindowSeekable() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment