From c5535e825e993e43f2cca63bfed258971d21ecda Mon Sep 17 00:00:00 2001 From: ibaker Date: Tue, 7 Jan 2020 12:54:13 +0000 Subject: [PATCH] Fix null-checker suppression introduced by 3.0.1 upgrade Suppression added in https://github.com/google/ExoPlayer/commit/6f9baffa0cc7daf8cbfd5e1f6c55a908190d2041 PiperOrigin-RevId: 288475120 --- .../com/google/android/exoplayer2/text/dvb/DvbParser.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java b/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java index 228973ce0c..8d99816ee1 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java @@ -481,8 +481,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * * @return The parsed object data. */ - // incompatible types in argument. - @SuppressWarnings("nullness:argument.type.incompatible") private static ObjectData parseObjectData(ParsableBitArray data) { int objectId = data.readBits(16); data.skipBits(4); // Skip object_version_number @@ -490,8 +488,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; boolean nonModifyingColorFlag = data.readBit(); data.skipBits(1); // Skip reserved. - @Nullable byte[] topFieldData = null; - @Nullable byte[] bottomFieldData = null; + byte[] topFieldData = Util.EMPTY_BYTE_ARRAY; + byte[] bottomFieldData = Util.EMPTY_BYTE_ARRAY; if (objectCodingMethod == OBJECT_CODING_STRING) { int numberOfCodes = data.readBits(8);