From 3ef0015817a3ab2793611a99e8122c575b3bb46c Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 28 Feb 2020 12:01:14 +0000
Subject: [PATCH] Ensure to update all existing MediaPeriodInfo to new Timeline

AnalyticsCollector keeps a list of existing MediaPeriodInfo that need
to be updated to new Timelines when they arrive. This already
happens in all cases except that the playingMediaPeriod wasn't updated
when it didn't change during the timeline update.

PiperOrigin-RevId: 297812038
---
 .../google/android/exoplayer2/analytics/AnalyticsCollector.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
index 692db18a17..cbdc7271db 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/analytics/AnalyticsCollector.java
@@ -790,6 +790,8 @@ public class AnalyticsCollector
       }
       if (!mediaPeriodInfoQueue.isEmpty()) {
         playingMediaPeriod = mediaPeriodInfoQueue.get(0);
+      } else if (playingMediaPeriod != null) {
+        playingMediaPeriod = updateMediaPeriodInfoToNewTimeline(playingMediaPeriod, timeline);
       }
       this.timeline = timeline;
       currentPlayerMediaPeriod = findMatchingMediaPeriodInQueue(player);