From 8583cd92c71f340436d3769f96e55e920863761f Mon Sep 17 00:00:00 2001 From: olly Date: Sat, 4 Apr 2020 06:19:20 +0100 Subject: [PATCH] Suppress warnings in preparation for Checker Framework 3.2.0 upgrade. In particular, replace @SuppressWarnings("initialization") with @SuppressWarnings("nullness"); see https://github.com/typetools/checker-framework/issues/3212. More information: go/checker-lsc Tested: TAP train for global presubmit queue http://test/OCL:304697666:BASE:304680497:1585968008044:f0c4fd6c PiperOrigin-RevId: 304751415 --- .../google/android/exoplayer2/text/SimpleSubtitleDecoder.java | 2 +- .../exoplayer2/trackselection/TrackSelectionParameters.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java index c9ddc9dd7e..7987c8b5d6 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java @@ -31,7 +31,7 @@ public abstract class SimpleSubtitleDecoder extends private final String name; /** @param name The name of the decoder. */ - @SuppressWarnings("initialization:method.invocation.invalid") + @SuppressWarnings("nullness:method.invocation.invalid") protected SimpleSubtitleDecoder(String name) { super(new SubtitleInputBuffer[2], new SubtitleOutputBuffer[2]); this.name = name; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java index 25bd53837f..3871a31a3b 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionParameters.java @@ -47,7 +47,7 @@ public class TrackSelectionParameters implements Parcelable { * * @param context Any context. */ - @SuppressWarnings({"deprecation", "initialization:method.invocation.invalid"}) + @SuppressWarnings({"deprecation", "nullness:method.invocation.invalid"}) public Builder(Context context) { this(); setPreferredTextLanguageAndRoleFlagsToCaptioningManagerSettings(context);