From c0d16ea2cb523d28477385ef6d6b619c21f77d1e Mon Sep 17 00:00:00 2001 From: tonihei Date: Wed, 10 May 2017 09:18:01 -0700 Subject: [PATCH] Possible NullPointerException in ExoPlayerImplInternal.setRepeatModeInternal When readingPeriodHolder and playingPeriodHolder are both null, a NullPointerException is thrown when trying to reassign readingPeriodHolder. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=155635846 --- .../com/google/android/exoplayer2/ExoPlayerImplInternal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java index d6fa17c171..45ff639d24 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java @@ -454,7 +454,7 @@ import java.io.IOException; if (!seenLoadingPeriodHolder) { loadingPeriodHolder = lastValidPeriodHolder; } - if (!seenReadingPeriodHolder) { + if (!seenReadingPeriodHolder && playingPeriodHolder != null) { // Renderers may have read from a period that's been removed. Seek back to the current // position of the playing period to make sure none of the removed period is played. int playingPeriodIndex = playingPeriodHolder.index;