loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Leanback library

Browse Source
This commit is contained in:
olly 2022-08-02 19:01:58 +00:00 committed by tonihei
parent 4d09ca6698
commit 8762322060
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/ui_leanback/src/main/java/androidx/media3/ui/leanback/LeanbackPlayerAdapter.java
View File

@ -95,6 +95,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
player.addListener(playerListener); player.addListener(playerListener);
} }
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void onDetachedFromHost() { public void onDetachedFromHost() {
player.removeListener(playerListener); player.removeListener(playerListener);
@ -136,6 +138,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
return player.getPlaybackState() == Player.STATE_IDLE ? -1 : player.getCurrentPosition(); return player.getPlaybackState() == Player.STATE_IDLE ? -1 : player.getCurrentPosition();
} }
// dereference of possibly-null reference getCallback()
@SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void play() { public void play() {
if (player.getPlaybackState() == Player.STATE_IDLE) { if (player.getPlaybackState() == Player.STATE_IDLE) {
@ -149,6 +153,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
} }
} }
// dereference of possibly-null reference getCallback()
@SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void pause() { public void pause() {
if (player.isCommandAvailable(Player.COMMAND_PLAY_PAUSE)) { if (player.isCommandAvailable(Player.COMMAND_PLAY_PAUSE)) {
@ -175,6 +181,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
// Runnable implementation. // Runnable implementation.
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void run() { public void run() {
Callback callback = getCallback(); Callback callback = getCallback();
@ -185,13 +193,19 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
// Internal methods. // Internal methods.
/* package */ void setVideoSurface(@Nullable Surface surface) { /* package */
// incompatible argument for parameter callback of maybeNotifyPreparedStateChanged.
@SuppressWarnings("nullness:argument.type.incompatible")
void setVideoSurface(@Nullable Surface surface) {
hasSurface = surface != null; hasSurface = surface != null;
player.setVideoSurface(surface); player.setVideoSurface(surface);
maybeNotifyPreparedStateChanged(getCallback()); maybeNotifyPreparedStateChanged(getCallback());
} }
/* package */ void notifyStateChanged() { /* package */
// incompatible argument for parameter callback of maybeNotifyPreparedStateChanged.
@SuppressWarnings("nullness:argument.type.incompatible")
void notifyStateChanged() {
int playbackState = player.getPlaybackState(); int playbackState = player.getPlaybackState();
Callback callback = getCallback(); Callback callback = getCallback();
maybeNotifyPreparedStateChanged(callback); maybeNotifyPreparedStateChanged(callback);
@ -236,6 +250,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
// Player.Listener implementation. // Player.Listener implementation.
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void onPlayerError(PlaybackException error) { public void onPlayerError(PlaybackException error) {
Callback callback = getCallback(); Callback callback = getCallback();
@ -254,6 +270,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
} }
} }
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) { public void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) {
Callback callback = getCallback(); Callback callback = getCallback();
@ -262,6 +280,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this); callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
} }
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void onPositionDiscontinuity( public void onPositionDiscontinuity(
Player.PositionInfo oldPosition, Player.PositionInfo oldPosition,
@ -272,6 +292,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this); callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
} }
// dereference of possibly-null reference getCallback()
@SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void onVideoSizeChanged(VideoSize videoSize) { public void onVideoSizeChanged(VideoSize videoSize) {
// There's no way to pass pixelWidthHeightRatio to leanback, so we scale the width that we // There's no way to pass pixelWidthHeightRatio to leanback, so we scale the width that we