From 58280f979ee07a0fc30ed39a6e898f4966a7d901 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Mon, 12 Jun 2017 03:49:12 -0700 Subject: [PATCH] Fix continueLoading in IMA deferred periods continueLoading may be called during preparation, but this is not handled correctly in the case where a deferred period doesn't have a source yet. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=158696539 --- .../google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java index 8e8c5aca19..00bd81d754 100644 --- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java +++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsMediaSource.java @@ -506,7 +506,7 @@ public final class ImaAdsMediaSource implements MediaSource { @Override public boolean continueLoading(long positionUs) { - return mediaPeriod.continueLoading(positionUs); + return mediaPeriod != null && mediaPeriod.continueLoading(positionUs); } // MediaPeriod.Callback implementation.