Really fix the NPE in ExoPlayer.

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=176821463

Really fix the NPE in ExoPlayer.
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=176821463
5cd88696 · baiming · Oliver Woodman · 91bcde03 · 5cd88696
Commit 5cd88696 authored Nov 24, 2017 by baiming Committed by Oliver Woodman Nov 27, 2017
Showing with 6 additions and 4 deletions
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
--- 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();
+      if (periodHolder.trackSelectorResult != null) {
-      for (TrackSelection trackSelection : trackSelections) {
+        TrackSelection[] trackSelections = periodHolder.trackSelectorResult.selections.getAll();
-        if (trackSelection != null) {
+        for (TrackSelection trackSelection : trackSelections) {
-          trackSelection.onPlaybackSpeed(playbackSpeed);
+          if (trackSelection != null) {
+            trackSelection.onPlaybackSpeed(playbackSpeed);
+          }
        }
      }
      periodHolder = periodHolder.next;