From 1896f2fa7c5c572a68cb9dffd5f21c9e03674a3f Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 22 May 2018 02:16:10 -0700 Subject: [PATCH] Save/restore current cues in SimpleExoPlayer ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=197531839 --- .../com/google/android/exoplayer2/SimpleExoPlayer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index 5539337257..0a0df03053 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -92,7 +92,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player private AudioAttributes audioAttributes; private float audioVolume; private MediaSource mediaSource; - private @Nullable List currentCues; + private List currentCues; /** * @param renderersFactory A factory for creating {@link Renderer}s to be used by the instance. @@ -178,6 +178,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player audioSessionId = C.AUDIO_SESSION_ID_UNSET; audioAttributes = AudioAttributes.DEFAULT; videoScalingMode = C.VIDEO_SCALING_MODE_DEFAULT; + currentCues = Collections.emptyList(); // Build the player and associated objects. player = createExoPlayerImpl(renderers, trackSelector, loadControl, clock); @@ -503,7 +504,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player @Override public void addTextOutput(TextOutput listener) { - if(currentCues != null) { + if (!currentCues.isEmpty()) { listener.onCues(currentCues); } textOutputs.add(listener); @@ -779,7 +780,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player mediaSource = null; analyticsCollector.resetForNewMediaSource(); } - currentCues = null; + currentCues = Collections.emptyList(); } @Override @@ -795,7 +796,7 @@ public class SimpleExoPlayer implements ExoPlayer, Player.VideoComponent, Player if (mediaSource != null) { mediaSource.removeEventListener(analyticsCollector); } - currentCues = null; + currentCues = Collections.emptyList(); } @Override