From 1ab5923f275fe3f29f819ca2dd46319f9dd0d795 Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 21 Apr 2020 11:01:48 +0100 Subject: [PATCH] Fix nullness checker warnings PiperOrigin-RevId: 307570994 --- .../google/android/exoplayer2/source/MergingMediaPeriod.java | 3 +-- .../google/android/exoplayer2/text/subrip/SubripDecoder.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 aa40497c9b..0c5af44816 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 @@ -158,8 +158,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; // Copy the new streams back into the streams array. System.arraycopy(newStreams, 0, streams, 0, newStreams.length); // Update the local state. - enabledPeriods = new MediaPeriod[enabledPeriodsList.size()]; - enabledPeriodsList.toArray(enabledPeriods); + enabledPeriods = enabledPeriodsList.toArray(new MediaPeriod[0]); compositeSequenceableLoader = compositeSequenceableLoaderFactory.createCompositeSequenceableLoader(enabledPeriods); return positionUs; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java index 51f5973261..6e25dfc52a 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java @@ -135,8 +135,7 @@ public final class SubripDecoder extends SimpleSubtitleDecoder { cues.add(Cue.EMPTY); } - Cue[] cuesArray = new Cue[cues.size()]; - cues.toArray(cuesArray); + Cue[] cuesArray = cues.toArray(new Cue[0]); long[] cueTimesUsArray = cueTimesUs.toArray(); return new SubripSubtitle(cuesArray, cueTimesUsArray); }