From 89b33ac9c088aa2df9d7bec5d8138ce2c1d08859 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 12 Jan 2021 14:51:31 +0000
Subject: [PATCH] Remove deprecated DefaultLoadControl constructors

PiperOrigin-RevId: 351361628
---
 RELEASENOTES.md                               |  3 ++
 .../exoplayer2/DefaultLoadControl.java        | 30 +------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b029419701..0cd7d665c8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,6 +3,9 @@
 ### dev-v2 (not yet released)
 
 *   Core library:
+    *   Remove long deprecated symbols:
+        *   `DefaultLoadControl` constructors - Use `DefaultLoadControl.Builder`
+            instead.
     *   Remove deprecated interface `AdaptiveMediaSourceEventListener`. Use
         `MediaSourceEventListener` instead.
     *   Add a `LivePlaybackSpeedControl` component to control the playback speed
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
index f80edcf334..e4b6edba5b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java
@@ -263,14 +263,8 @@ public class DefaultLoadControl implements LoadControl {
   /** Constructs a new instance, using the {@code DEFAULT_*} constants defined in this class. */
   @SuppressWarnings("deprecation")
   public DefaultLoadControl() {
-    this(new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE));
-  }
-
-  /** @deprecated Use {@link Builder} instead. */
-  @Deprecated
-  public DefaultLoadControl(DefaultAllocator allocator) {
     this(
-        allocator,
+        new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE),
         DEFAULT_MIN_BUFFER_MS,
         DEFAULT_MAX_BUFFER_MS,
         DEFAULT_BUFFER_FOR_PLAYBACK_MS,
@@ -281,28 +275,6 @@ public class DefaultLoadControl implements LoadControl {
         DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME);
   }
 
-  /** @deprecated Use {@link Builder} instead. */
-  @Deprecated
-  public DefaultLoadControl(
-      DefaultAllocator allocator,
-      int minBufferMs,
-      int maxBufferMs,
-      int bufferForPlaybackMs,
-      int bufferForPlaybackAfterRebufferMs,
-      int targetBufferBytes,
-      boolean prioritizeTimeOverSizeThresholds) {
-    this(
-        allocator,
-        minBufferMs,
-        maxBufferMs,
-        bufferForPlaybackMs,
-        bufferForPlaybackAfterRebufferMs,
-        targetBufferBytes,
-        prioritizeTimeOverSizeThresholds,
-        DEFAULT_BACK_BUFFER_DURATION_MS,
-        DEFAULT_RETAIN_BACK_BUFFER_FROM_KEYFRAME);
-  }
-
   protected DefaultLoadControl(
       DefaultAllocator allocator,
       int minBufferMs,