From e4b49477ec74f83f0369e9d25cae8a46889f3361 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 26 Mar 2019 11:04:01 +0000
Subject: [PATCH] Some nullability cleanup for HLS playlists

PiperOrigin-RevId: 240318686
---
 .../source/hls/playlist/HlsMediaPlaylist.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
index e45d6c7043..4411c9865e 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java
@@ -43,7 +43,7 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
      * the media playlist does not define a media section for this segment. The same instance is
      * used for all segments that share an EXT-X-MAP tag.
      */
-    public final @Nullable Segment initializationSegment;
+    @Nullable public final Segment initializationSegment;
     /** The duration of the segment in microseconds, as defined by #EXTINF. */
     public final long durationUs;
     /** The human readable title of the segment. */
@@ -60,17 +60,17 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
      * DRM initialization data for sample decryption, or null if the segment does not use CDM-DRM
      * protection.
      */
-    public final @Nullable DrmInitData drmInitData;
+    @Nullable public final DrmInitData drmInitData;
     /**
      * The encryption identity key uri as defined by #EXT-X-KEY, or null if the segment does not use
      * full segment encryption with identity key.
      */
-    public final @Nullable String fullSegmentEncryptionKeyUri;
+    @Nullable public final String fullSegmentEncryptionKeyUri;
     /**
      * The encryption initialization vector as defined by #EXT-X-KEY, or null if the segment is not
      * encrypted.
      */
-    public final @Nullable String encryptionIV;
+    @Nullable public final String encryptionIV;
     /**
      * The segment's byte range offset, as defined by #EXT-X-BYTERANGE.
      */
@@ -222,7 +222,7 @@ public final class HlsMediaPlaylist extends HlsPlaylist {
    * Contains the CDM protection schemes used by segments in this playlist. Does not contain any key
    * acquisition data. Null if none of the segments in the playlist is CDM-encrypted.
    */
-  public final @Nullable DrmInitData protectionSchemes;
+  @Nullable public final DrmInitData protectionSchemes;
   /**
    * The list of segments in the playlist.
    */