From cc337a3e2d42118acfa32bd33eff0b7d207605ca Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 7 Jun 2019 23:09:13 +0100
Subject: [PATCH] Update nullness annotations.

PiperOrigin-RevId: 252127811
---
 .../exoplayer2/source/chunk/BaseMediaChunk.java      |  3 ++-
 .../android/exoplayer2/source/chunk/ChunkHolder.java |  8 ++++----
 .../exoplayer2/source/chunk/ChunkSampleStream.java   | 12 ++++++------
 .../android/exoplayer2/source/chunk/MediaChunk.java  |  3 ++-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java
index 68322c60a1..74d8ddad3d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -58,7 +59,7 @@ public abstract class BaseMediaChunk extends MediaChunk {
       DataSpec dataSpec,
       Format trackFormat,
       int trackSelectionReason,
-      Object trackSelectionData,
+      @Nullable Object trackSelectionData,
       long startTimeUs,
       long endTimeUs,
       long clippedStartTimeUs,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java
index 6b7f5688ae..d6400c5165 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java
@@ -15,15 +15,15 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
+import androidx.annotation.Nullable;
+
 /**
  * Holds a chunk or an indication that the end of the stream has been reached.
  */
 public final class ChunkHolder {
 
-  /**
-   * The chunk.
-   */
-  public Chunk chunk;
+  /** The chunk. */
+  @Nullable public Chunk chunk;
 
   /**
    * Indicates that the end of the stream has been reached.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
index d9b28d9c92..499aea6a0c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
@@ -60,8 +60,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
 
   public final int primaryTrackType;
 
-  private final int[] embeddedTrackTypes;
-  private final Format[] embeddedTrackFormats;
+  @Nullable private final int[] embeddedTrackTypes;
+  @Nullable private final Format[] embeddedTrackFormats;
   private final boolean[] embeddedTracksSelected;
   private final T chunkSource;
   private final SequenceableLoader.Callback<ChunkSampleStream<T>> callback;
@@ -104,8 +104,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
   @Deprecated
   public ChunkSampleStream(
       int primaryTrackType,
-      int[] embeddedTrackTypes,
-      Format[] embeddedTrackFormats,
+      @Nullable int[] embeddedTrackTypes,
+      @Nullable Format[] embeddedTrackFormats,
       T chunkSource,
       Callback<ChunkSampleStream<T>> callback,
       Allocator allocator,
@@ -140,8 +140,8 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
    */
   public ChunkSampleStream(
       int primaryTrackType,
-      int[] embeddedTrackTypes,
-      Format[] embeddedTrackFormats,
+      @Nullable int[] embeddedTrackTypes,
+      @Nullable Format[] embeddedTrackFormats,
       T chunkSource,
       Callback<ChunkSampleStream<T>> callback,
       Allocator allocator,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java
index 9626f4b03f..39c097826f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
+import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -44,7 +45,7 @@ public abstract class MediaChunk extends Chunk {
       DataSpec dataSpec,
       Format trackFormat,
       int trackSelectionReason,
-      Object trackSelectionData,
+      @Nullable Object trackSelectionData,
       long startTimeUs,
       long endTimeUs,
       long chunkIndex) {