Commit 368d2826 by Googler Committed by microkatz

Update Leanback library from androidx-platform-dev with build#8803384

TGP: https://fusion2.corp.google.com/presubmit/tap/459592967/OCL:459592967:BASE:464692555:1659412331108:1ed6eb4e/targets

If you need additional help investigating this issue, please consider using g/androidx-discuss to reach the wider Jetpack library owner and client community. For general questions about prebuilt drops, refer to go/androidx/g3_faq

PiperOrigin-RevId: 464852576
(cherry picked from commit a3de13c9)
parent 0b0475e8
......@@ -93,6 +93,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
player.addListener(playerListener);
}
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override
public void onDetachedFromHost() {
player.removeListener(playerListener);
......@@ -134,6 +136,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
return player.getPlaybackState() == Player.STATE_IDLE ? -1 : player.getCurrentPosition();
}
// dereference of possibly-null reference getCallback()
@SuppressWarnings("nullness:dereference.of.nullable")
@Override
public void play() {
if (player.getPlaybackState() == Player.STATE_IDLE) {
......@@ -147,6 +151,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
}
}
// dereference of possibly-null reference getCallback()
@SuppressWarnings("nullness:dereference.of.nullable")
@Override
public void pause() {
if (player.isCommandAvailable(Player.COMMAND_PLAY_PAUSE)) {
......@@ -173,6 +179,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
// Runnable implementation.
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override
public void run() {
Callback callback = getCallback();
......@@ -183,13 +191,19 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
// 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;
player.setVideoSurface(surface);
maybeNotifyPreparedStateChanged(getCallback());
}
/* package */ void notifyStateChanged() {
/* package */
// incompatible argument for parameter callback of maybeNotifyPreparedStateChanged.
@SuppressWarnings("nullness:argument.type.incompatible")
void notifyStateChanged() {
int playbackState = player.getPlaybackState();
Callback callback = getCallback();
maybeNotifyPreparedStateChanged(callback);
......@@ -234,6 +248,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
// Player.Listener implementation.
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override
public void onPlayerError(PlaybackException error) {
Callback callback = getCallback();
......@@ -252,6 +268,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
}
}
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override
public void onTimelineChanged(Timeline timeline, @TimelineChangeReason int reason) {
Callback callback = getCallback();
......@@ -260,6 +278,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
}
// dereference of possibly-null reference callback
@SuppressWarnings("nullness:dereference.of.nullable")
@Override
public void onPositionDiscontinuity(
Player.PositionInfo oldPosition,
......@@ -270,6 +290,8 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
}
// dereference of possibly-null reference getCallback()
@SuppressWarnings("nullness:dereference.of.nullable")
@Override
public void onVideoSizeChanged(VideoSize videoSize) {
// There's no way to pass pixelWidthHeightRatio to leanback, so we scale the width that we
......
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