From 2a79931ec5892c751c629c800c019277d146752a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 12 Dec 2016 11:36:20 -0800
Subject: [PATCH] Fix onTimelineChanged call (timeline should never be null).

Issue: #2186

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=141790023
---
 .../main/java/com/google/android/exoplayer2/ExoPlayer.java    | 4 ++--
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index c84e6f9985..06d7af163f 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -120,8 +120,8 @@ public interface ExoPlayer {
      * removed from the timeline. The will <em>not</em> be reported via a separate call to
      * {@link #onPositionDiscontinuity()}.
      *
-     * @param timeline The latest timeline, or null if the timeline is being cleared.
-     * @param manifest The latest manifest, or null if the manifest is being cleared.
+     * @param timeline The latest timeline. Never null, but may be empty.
+     * @param manifest The latest manifest. May be null.
      */
     void onTimelineChanged(Timeline timeline, Object manifest);
 
diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index 30de3ffdcf..a7cbeb524c 100644
--- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -125,7 +125,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
         timeline = Timeline.EMPTY;
         manifest = null;
         for (EventListener listener : listeners) {
-          listener.onTimelineChanged(null, null);
+          listener.onTimelineChanged(timeline, manifest);
         }
       }
       if (tracksSelected) {