From 9ec524a7e2a8bf929d8f4e28499b572904d176fd Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 10 Dec 2019 12:18:30 +0000 Subject: [PATCH] Rollback of https://github.com/google/ExoPlayer/commit/355ed11a3cd6d90eb02d9f773a546561884324b3 *** Original commit *** Suppress warnings emitted by Checker Framework version 2.11.1 More information: https://docs.google.com/document/d/16tpK6aXqN68PvTyvt4siM-m7f0NXi_8xEeitLDzr8xY/edit?usp=sharing Tested: TAP --sample ran all affected tests and none failed http://test/OCL:278915274:BASE:278884711:1573074344615:a6701677 *** PiperOrigin-RevId: 284741721 --- .../google/android/exoplayer2/ext/flac/FlacDecoderJni.java | 6 ------ .../com/google/android/exoplayer2/ui/DefaultTimeBar.java | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java index 60f1d32a79..5e020175e7 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderJni.java @@ -51,12 +51,6 @@ import java.nio.ByteBuffer; @Nullable private byte[] tempBuffer; private boolean endOfExtractorInput; - // the constructor does not initialize fields: tempBuffer - // call to flacInit() not allowed on the given receiver. - @SuppressWarnings({ - "nullness:initialization.fields.uninitialized", - "nullness:method.invocation.invalid" - }) public FlacDecoderJni() throws FlacDecoderException { if (!FlacLibrary.isAvailable()) { throw new FlacDecoderException("Failed to load decoder native libraries."); 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 89bcaf84bc..79e50c19de 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 @@ -226,11 +226,7 @@ public class DefaultTimeBar extends View implements TimeBar { } // Suppress warnings due to usage of View methods in the constructor. - // the constructor does not initialize fields: adGroupTimesMs, playedAdGroups - @SuppressWarnings({ - "nullness:method.invocation.invalid", - "nullness:initialization.fields.uninitialized" - }) + @SuppressWarnings("nullness:method.invocation.invalid") public DefaultTimeBar( Context context, @Nullable AttributeSet attrs,