From 0f1f6bfa41e2463382e1ca8089f6845d0621633e Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 24 May 2024 05:00:17 -0700
Subject: [PATCH] Remove deprecated `DefaultHttpDataSource` constructors

Use `DefaultHttpDataSource.Factory` instead.

PiperOrigin-RevId: 636875524
---
 RELEASENOTES.md                               |  2 +
 .../datasource/DefaultHttpDataSource.java     | 58 -------------------
 2 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d4b4165b5f..7e3db3662c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -207,6 +207,8 @@
         instead.
     *   Remove `Timeline.Window.isLive` field. Use the `isLive()` method
         instead.
+    *   Remove `DefaultHttpDataSource` constructors. Use
+        `DefaultHttpDataSource.Factory` instead.
 
 ## 1.4
 
diff --git a/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java b/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java
index d37e8ab61d..2779b49db1 100644
--- a/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java
+++ b/libraries/datasource/src/main/java/androidx/media3/datasource/DefaultHttpDataSource.java
@@ -268,64 +268,6 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
   private long bytesToRead;
   private long bytesRead;
 
-  /**
-   * @deprecated Use {@link DefaultHttpDataSource.Factory} instead.
-   */
-  @UnstableApi
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  public DefaultHttpDataSource() {
-    this(/* userAgent= */ null, DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS);
-  }
-
-  /**
-   * @deprecated Use {@link DefaultHttpDataSource.Factory} instead.
-   */
-  @UnstableApi
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  public DefaultHttpDataSource(@Nullable String userAgent) {
-    this(userAgent, DEFAULT_CONNECT_TIMEOUT_MILLIS, DEFAULT_READ_TIMEOUT_MILLIS);
-  }
-
-  /**
-   * @deprecated Use {@link DefaultHttpDataSource.Factory} instead.
-   */
-  @UnstableApi
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  public DefaultHttpDataSource(
-      @Nullable String userAgent, int connectTimeoutMillis, int readTimeoutMillis) {
-    this(
-        userAgent,
-        connectTimeoutMillis,
-        readTimeoutMillis,
-        /* allowCrossProtocolRedirects= */ false,
-        /* defaultRequestProperties= */ null);
-  }
-
-  /**
-   * @deprecated Use {@link DefaultHttpDataSource.Factory} instead.
-   */
-  @UnstableApi
-  @Deprecated
-  public DefaultHttpDataSource(
-      @Nullable String userAgent,
-      int connectTimeoutMillis,
-      int readTimeoutMillis,
-      boolean allowCrossProtocolRedirects,
-      @Nullable RequestProperties defaultRequestProperties) {
-    this(
-        userAgent,
-        connectTimeoutMillis,
-        readTimeoutMillis,
-        allowCrossProtocolRedirects,
-        /* crossProtocolRedirectsForceOriginal= */ false,
-        defaultRequestProperties,
-        /* contentTypePredicate= */ null,
-        /* keepPostFor302Redirects= */ false);
-  }
-
   private DefaultHttpDataSource(
       @Nullable String userAgent,
       int connectTimeoutMillis,