From b57c55619473cc5e52c5df29ca57daebc3c2299b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 5 Sep 2019 09:41:06 +0100
Subject: [PATCH] Remove deprecated Timeline.getWindow method.

Removing this method requires custom MediaSource implementations to switch
to the new version. While this breaks the implmentation, it also avoids problems
with accidentely forwarding to the wrong method or with accidental stack
overflows when none of the two methods gets implemented.

It's unlikely any callers are affected because this is only the extended version
with the defaultProjectionPositionUs parameter that no caller except the
internal player will use.

PiperOrigin-RevId: 267323042
---
 .../com/google/android/exoplayer2/Timeline.java     | 13 ++-----------
 .../exoplayer2/source/ForwardingTimeline.java       |  6 ------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
index 0018a15157..172d9c4107 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
@@ -657,17 +657,8 @@ public abstract class Timeline {
    *     default start position should be projected.
    * @return The populated {@link Window}, for convenience.
    */
-  @SuppressWarnings("deprecation")
-  public Window getWindow(int windowIndex, Window window, long defaultPositionProjectionUs) {
-    return getWindow(windowIndex, window, /* setTag= */ true, defaultPositionProjectionUs);
-  }
-
-  /** @deprecated Implement {@link #getWindow(int, Window, long)} instead and always set the tag. */
-  @Deprecated
-  public Window getWindow(
-      int windowIndex, Window window, boolean setTag, long defaultPositionProjectionUs) {
-    return getWindow(windowIndex, window, defaultPositionProjectionUs);
-  }
+  public abstract Window getWindow(
+      int windowIndex, Window window, long defaultPositionProjectionUs);
 
   /**
    * Returns the number of periods in the timeline.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
index c36e62db86..38b373b26c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
@@ -61,12 +61,6 @@ public abstract class ForwardingTimeline extends Timeline {
     return timeline.getWindow(windowIndex, window, defaultPositionProjectionUs);
   }
 
-  @Override
-  public final Window getWindow(
-      int windowIndex, Window window, boolean setIds, long defaultPositionProjectionUs) {
-    return getWindow(windowIndex, window, defaultPositionProjectionUs);
-  }
-
   @Override
   public int getPeriodCount() {
     return timeline.getPeriodCount();