From 3ec0ccabbc96ecd2164a6cd646493b92e72f7825 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 31 Jul 2017 07:00:10 -0700
Subject: [PATCH] Check for null entries in ConcatenatingMediaSource

We do this in the dynamic case, and I think we've seen
a few GitHub issues where developers do this and don't
understand what they've done wrong (because the failure
comes later).

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

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
index de42df9a14..2c998e8a06 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
@@ -57,6 +57,9 @@ public final class ConcatenatingMediaSource implements MediaSource {
    *     {@link MediaSource} instance to be present more than once in the array.
    */
   public ConcatenatingMediaSource(boolean isRepeatOneAtomic, MediaSource... mediaSources) {
+    for (MediaSource mediaSource : mediaSources) {
+      Assertions.checkNotNull(mediaSource);
+    }
     this.mediaSources = mediaSources;
     this.isRepeatOneAtomic = isRepeatOneAtomic;
     timelines = new Timeline[mediaSources.length];