From 42d78b35590beb0fc39bd527bbc8259010793731 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Thu, 7 Jul 2016 07:42:57 -0700 Subject: [PATCH] Fix seeking before a source is set. Before this change, calling seekTo then setPlayWhenReady would cause the player throw an error, due to using the sample source provider before it's set. Transition to the buffering state in seekToInternal only if we have a sample source provider. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=126804528 --- .../com/google/android/exoplayer/ExoPlayerImplInternal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java index 8151ddb578..89b6271883 100644 --- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java +++ b/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java @@ -468,7 +468,6 @@ import java.util.ArrayList; return; } - setState(ExoPlayer.STATE_BUFFERING); stopRenderers(); rebuffering = false; @@ -483,6 +482,7 @@ import java.util.ArrayList; updatePlaybackPositions(); if (sampleSourceProvider != null) { + setState(ExoPlayer.STATE_BUFFERING); handler.sendEmptyMessage(MSG_DO_SOME_WORK); } } finally {