From 6bf89bb49a65efa067dfdc201f01b2e95e9a298d Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 11 May 2020 22:45:20 +0100 Subject: [PATCH] Fix nullness checker warnings PiperOrigin-RevId: 310997932 --- .../com/google/android/exoplayer2/metadata/Metadata.java | 3 +-- .../google/android/exoplayer2/metadata/id3/Id3Decoder.java | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java index 046c1fef55..21dacd4f9b 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java @@ -63,8 +63,7 @@ public final class Metadata implements Parcelable { * @param entries The metadata entries. */ public Metadata(List entries) { - this.entries = new Entry[entries.size()]; - entries.toArray(this.entries); + this.entries = entries.toArray(new Entry[0]); } /* package */ Metadata(Parcel in) { diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java index 84a316e848..19b970e726 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java @@ -626,8 +626,7 @@ public final class Id3Decoder implements MetadataDecoder { } } - Id3Frame[] subFrameArray = new Id3Frame[subFrames.size()]; - subFrames.toArray(subFrameArray); + Id3Frame[] subFrameArray = subFrames.toArray(new Id3Frame[0]); return new ChapterFrame(chapterId, startTime, endTime, startOffset, endOffset, subFrameArray); } @@ -668,8 +667,7 @@ public final class Id3Decoder implements MetadataDecoder { } } - Id3Frame[] subFrameArray = new Id3Frame[subFrames.size()]; - subFrames.toArray(subFrameArray); + Id3Frame[] subFrameArray = subFrames.toArray(new Id3Frame[0]); return new ChapterTocFrame(elementId, isRoot, isOrdered, children, subFrameArray); }