From 006263e9836ad929f6cfa169a299407f613fdb1c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 19 Oct 2017 06:34:02 -0700
Subject: [PATCH] Retain playback position on re-preparation

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172736350
---
 .../com/google/android/exoplayer2/ExoPlayerImplInternal.java  | 4 ++++
 1 file changed, 4 insertions(+)

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 b8274126b5..1e486a06d0 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
@@ -430,6 +430,10 @@ import java.io.IOException;
     loadControl.onPrepared();
     if (resetPosition) {
       playbackInfo = new PlaybackInfo(0, C.TIME_UNSET);
+    } else {
+      // The new start position is the current playback position.
+      playbackInfo = new PlaybackInfo(playbackInfo.periodId, playbackInfo.positionUs,
+          playbackInfo.contentPositionUs);
     }
     this.mediaSource = mediaSource;
     mediaSource.prepareSource(player, true, this);