From d1e057244812a566a5fc8b18a2caec1908db1a43 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 10 Apr 2020 03:47:54 +0100 Subject: [PATCH] Suppress warnings in preparation for Checker Framework 3.3.0 upgrade. PiperOrigin-RevId: 305810757 --- .../android/exoplayer2/ext/cronet/CronetEngineWrapper.java | 3 ++- .../google/android/exoplayer2/source/MergingMediaPeriod.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java index 7d549be7cb..2c25c32269 100644 --- a/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java +++ b/extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java @@ -166,7 +166,8 @@ public final class CronetEngineWrapper { private final boolean preferGMSCoreCronet; // Multi-catch can only be used for API 19+ in this case. - @SuppressWarnings("UseMultiCatch") + // incompatible types in argument. + @SuppressWarnings({"UseMultiCatch", "nullness:argument.type.incompatible"}) public CronetProviderComparator(boolean preferGMSCoreCronet) { // GMSCore CronetProvider classes are only available in some configurations. // Thus, we use reflection to copy static name. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java index c2e0c478ee..2bba84a754 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java @@ -96,6 +96,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; return Assertions.checkNotNull(trackGroups); } + // unboxing a possibly-null reference streamPeriodIndices.get(streams[i]) + @SuppressWarnings("nullness:unboxing.of.nullable") @Override public long selectTracks( @NullableType TrackSelection[] selections,