From 628ebeeb2b10dcb9f073563d2ad5887eee51096d Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 8 Jun 2021 18:16:48 +0100 Subject: [PATCH] Update `@SuppressWarnings` annotations for go/nullness diagnostics in preparation for upgrading the version of the Checker Framework in google3. More information: go/checker-3110-lsc PiperOrigin-RevId: 378184078 --- .../android/exoplayer2/ext/media2/SessionCallback.java | 2 +- .../com/google/android/exoplayer2/ui/DefaultTimeBar.java | 2 +- .../google/android/exoplayer2/ui/PlayerControlView.java | 6 +++--- .../android/exoplayer2/ui/PlayerNotificationManager.java | 7 +++++-- .../java/com/google/android/exoplayer2/ui/PlayerView.java | 7 ++++++- .../android/exoplayer2/ui/StyledPlayerControlView.java | 8 ++++---- .../ui/StyledPlayerControlViewLayoutManager.java | 4 ++-- .../google/android/exoplayer2/ui/StyledPlayerView.java | 7 ++++++- .../exoplayer2/ui/TrackSelectionDialogBuilder.java | 2 +- 9 files changed, 29 insertions(+), 16 deletions(-) diff --git a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionCallback.java b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionCallback.java index 4b161a7345..fb64fcd487 100644 --- a/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionCallback.java +++ b/extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/SessionCallback.java @@ -352,7 +352,7 @@ import java.util.concurrent.TimeoutException; // TODO(internal b/160846312): Remove warning suppression and mark item @Nullable once we depend // on media2 1.2.0. @Override - @SuppressWarnings("nullness:override.param.invalid") + @SuppressWarnings({"nullness:override.param.invalid", "nullness:override.param"}) public void onCurrentMediaItemChanged(SessionPlayer player, MediaItem item) { currentMediaItemBuffered = isBufferedState(player.getBufferingState()); updateAllowedCommands(); diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java index 95d939f157..562ab0508b 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java @@ -243,7 +243,7 @@ public class DefaultTimeBar extends View implements TimeBar { } // Suppress warnings due to usage of View methods in the constructor. - @SuppressWarnings("nullness:method.invocation.invalid") + @SuppressWarnings({"nullness:method.invocation.invalid", "nullness:method.invocation"}) public DefaultTimeBar( Context context, @Nullable AttributeSet attrs, diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java index 9aae362196..b048d770b1 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java @@ -361,9 +361,9 @@ public class PlayerControlView extends FrameLayout { } @SuppressWarnings({ - "nullness:argument.type.incompatible", - "nullness:method.invocation.invalid", - "nullness:methodref.receiver.bound.invalid" + "nullness:argument.type.incompatible", "nullness:argument", + "nullness:method.invocation.invalid", "nullness:method.invocation", + "nullness:methodref.receiver.bound.invalid", "nullness:methodref.receiver.bound" }) public PlayerControlView( Context context, diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java index dd84cc9d89..70deeacc84 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java @@ -704,7 +704,10 @@ public class PlayerNotificationManager { // This fails the nullness checker because handleMessage() is 'called' while `this` is still // @UnderInitialization. No tasks are scheduled on mainHandler before the constructor completes, // so this is safe and we can suppress the warning. - @SuppressWarnings("nullness:methodref.receiver.bound.invalid") + @SuppressWarnings({ + "nullness:methodref.receiver.bound.invalid", + "nullness:methodref.receiver.bound" + }) Handler mainHandler = Util.createHandler(Looper.getMainLooper(), this::handleMessage); this.mainHandler = mainHandler; notificationManager = NotificationManagerCompat.from(context); @@ -1461,7 +1464,7 @@ public class PlayerNotificationManager { return PendingIntent.getBroadcast(context, instanceId, intent, pendingFlags); } - @SuppressWarnings("nullness:argument.type.incompatible") + @SuppressWarnings({"nullness:argument.type.incompatible", "nullness:argument"}) private static void setLargeIcon(NotificationCompat.Builder builder, @Nullable Bitmap largeIcon) { builder.setLargeIcon(largeIcon); } diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java index eed9d7e360..603b14c7bf 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java @@ -324,7 +324,12 @@ public class PlayerView extends FrameLayout implements AdViewProvider { this(context, attrs, /* defStyleAttr= */ 0); } - @SuppressWarnings({"nullness:argument.type.incompatible", "nullness:method.invocation.invalid"}) + @SuppressWarnings({ + "nullness:argument.type.incompatible", + "nullness:argument", + "nullness:method.invocation.invalid", + "nullness:method.invocation" + }) public PlayerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java index 7a24d1244e..9771e8dc83 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java @@ -470,10 +470,10 @@ public class StyledPlayerControlView extends FrameLayout { } @SuppressWarnings({ - "nullness:argument.type.incompatible", - "nullness:assignment.type.incompatible", - "nullness:method.invocation.invalid", - "nullness:methodref.receiver.bound.invalid" + "nullness:argument.type.incompatible", "nullness:argument", + "nullness:assignment.type.incompatible", "nullness:assignment", + "nullness:method.invocation.invalid", "nullness:method.invocation", + "nullness:methodref.receiver.bound.invalid", "nullness:methodref.receiver.bound" }) public StyledPlayerControlView( Context context, diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java index 6fbf759305..81ec217116 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java @@ -84,8 +84,8 @@ import java.util.List; private boolean animationEnabled; @SuppressWarnings({ - "nullness:method.invocation.invalid", - "nullness:methodref.receiver.bound.invalid" + "nullness:method.invocation.invalid", "nullness:method.invocation", + "nullness:methodref.receiver.bound.invalid", "nullness:methodref.receiver.bound" }) public StyledPlayerControlViewLayoutManager(StyledPlayerControlView styledPlayerControlView) { this.styledPlayerControlView = styledPlayerControlView; diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java index eab989bd22..3c224f99b9 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerView.java @@ -325,7 +325,12 @@ public class StyledPlayerView extends FrameLayout implements AdViewProvider { this(context, attrs, /* defStyleAttr= */ 0); } - @SuppressWarnings({"nullness:argument.type.incompatible", "nullness:method.invocation.invalid"}) + @SuppressWarnings({ + "nullness:argument.type.incompatible", + "nullness:argument", + "nullness:method.invocation.invalid", + "nullness:method.invocation" + }) public StyledPlayerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java index 062bec788d..673a1f5117 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java @@ -256,7 +256,7 @@ public final class TrackSelectionDialogBuilder { } // Reflection calls can't verify null safety of return values or parameters. - @SuppressWarnings("nullness:argument.type.incompatible") + @SuppressWarnings({"nullness:argument.type.incompatible", "nullness:argument"}) @Nullable private Dialog buildForAndroidX() { try {