From 5d728abc41cc7fd893a90083653baddfec3275ed Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@users.noreply.github.com>
Date: Fri, 20 Dec 2019 16:38:34 +0000
Subject: [PATCH] Fix potentially wrong window index in onMediaPeriodCreated.

Issue:#6776
---
 .../android/exoplayer2/analytics/AnalyticsCollector.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 5a57844c835..b215fa52116 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
@@ -806,7 +806,10 @@ public void onSeekProcessed() {
     public void onMediaPeriodCreated(int windowIndex, MediaPeriodId mediaPeriodId) {
       boolean isInTimeline = timeline.getIndexOfPeriod(mediaPeriodId.periodUid) != C.INDEX_UNSET;
       MediaPeriodInfo mediaPeriodInfo =
-          new MediaPeriodInfo(mediaPeriodId, isInTimeline ? timeline : Timeline.EMPTY, windowIndex);
+          new MediaPeriodInfo(
+              mediaPeriodId,
+              isInTimeline ? timeline : Timeline.EMPTY,
+              isInTimeline ? timeline.getPeriod(periodIndex, period).windowIndex : windowIndex);
       mediaPeriodInfoQueue.add(mediaPeriodInfo);
       mediaPeriodIdToInfo.put(mediaPeriodId, mediaPeriodInfo);
       lastPlayingMediaPeriod = mediaPeriodInfoQueue.get(0);