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();