From 9ec2d2fb362683e16547525f7bbf36edc427eda9 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 17 Oct 2019 12:56:16 +0100
Subject: [PATCH] Remove HlsMediaSource from null-checking blacklist

PiperOrigin-RevId: 275233915
---
 .../google/android/exoplayer2/source/hls/HlsMediaSource.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
index 28be2cca9b..4f6a0405f2 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java
@@ -440,7 +440,9 @@ public final class HlsMediaSource extends BaseMediaSource
             ? windowStartTimeMs
             : C.TIME_UNSET;
     long windowDefaultStartPositionUs = playlist.startOffsetUs;
-    HlsManifest manifest = new HlsManifest(playlistTracker.getMasterPlaylist(), playlist);
+    // masterPlaylist is non-null because the first playlist has been fetched by now.
+    HlsManifest manifest =
+        new HlsManifest(Assertions.checkNotNull(playlistTracker.getMasterPlaylist()), playlist);
     if (playlistTracker.isLive()) {
       long offsetFromInitialStartTimeUs =
           playlist.startTimeUs - playlistTracker.getInitialStartTimeUs();