From 5cd8869646b0391cd26a194564772d0c64587df0 Mon Sep 17 00:00:00 2001 From: baiming Date: Fri, 24 Nov 2017 01:32:44 -0800 Subject: [PATCH] Really fix the NPE in ExoPlayer. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=176821463 --- .../android/exoplayer2/ExoPlayerImplInternal.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 8895b8e03a..4e37211e80 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 @@ -947,10 +947,12 @@ import java.io.IOException; MediaPeriodHolder periodHolder = playingPeriodHolder != null ? playingPeriodHolder : loadingPeriodHolder; while (periodHolder != null) { - TrackSelection[] trackSelections = periodHolder.trackSelectorResult.selections.getAll(); - for (TrackSelection trackSelection : trackSelections) { - if (trackSelection != null) { - trackSelection.onPlaybackSpeed(playbackSpeed); + if (periodHolder.trackSelectorResult != null) { + TrackSelection[] trackSelections = periodHolder.trackSelectorResult.selections.getAll(); + for (TrackSelection trackSelection : trackSelections) { + if (trackSelection != null) { + trackSelection.onPlaybackSpeed(playbackSpeed); + } } } periodHolder = periodHolder.next;