From 24f866e7886d6432787d48c657ad238c8d1bc3e8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 19 Jan 2018 07:54:04 -0800
Subject: [PATCH] Fix DashMediaSource NPE

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=182534505
---
 .../android/exoplayer2/source/dash/DashMediaSource.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
index 2169dd1e11..593cf4f231 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
@@ -605,13 +605,13 @@ public final class DashMediaSource implements MediaSource {
     // If we receive a dynamic manifest that's older than expected (i.e. its publish time has
     // expired, or it's dynamic and we know the presentation has ended), then ignore it and load
     // again up to a specified number of times.
-    if (manifest.dynamic
+    if (newManifest.dynamic
         && (dynamicMediaPresentationEnded
-            || manifest.publishTimeMs <= expiredManifestPublishTimeUs)) {
+            || newManifest.publishTimeMs <= expiredManifestPublishTimeUs)) {
       Log.w(
           TAG,
           "Loaded stale dynamic manifest: "
-              + manifest.publishTimeMs
+              + newManifest.publishTimeMs
               + ", "
               + dynamicMediaPresentationEnded
               + ", "