From f57434006f49bc5dd5dfb620e292287f4cce89da Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 17 Nov 2016 06:02:39 -0800 Subject: [PATCH] Fix potential NPE in ExoPlayerImplInternal I'll have a more thorough refactor of some of this class fairly soon! ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=139451693 --- .../com/google/android/exoplayer2/ExoPlayerImplInternal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java index 743015509b..c47dc71209 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java @@ -918,7 +918,7 @@ import java.io.IOException; Object uid = loadingPeriodHolder.uid; int index = timeline.getIndexOfPeriod(uid); if (index == C.INDEX_UNSET) { - boolean restarted = attemptRestart(playingPeriodHolder.index, oldTimeline, timeline); + boolean restarted = attemptRestart(loadingPeriodHolder.index, oldTimeline, timeline); finishSourceInfoRefresh(manifest, true); if (!restarted) { // TODO: We should probably propagate an error here.