From 7ac9cf0ec7d258c77ec0afe6b77a80f6fdb28bdd Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 15 May 2023 15:21:03 +0100
Subject: [PATCH] Remove deprecated `DefaultDrmSessionManager` constructors

Use `DefaultDrmSessionManager.Builder` instead.

#minor-release

PiperOrigin-RevId: 532102375
(cherry picked from commit 8a5cebb54dd17e40f0d10700645659450dd7d934)
---
 RELEASENOTES.md                               |  2 +
 .../drm/DefaultDrmSessionManager.java         | 83 -------------------
 2 files changed, 2 insertions(+), 83 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a7fc67516a..efb1ef0ef0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -16,6 +16,8 @@
         performance.
     *   Remove `DefaultBandwidthMeter` constructor, use
         `DefaultBandwidthMeter.Builder` instead.
+    *   Remove `DefaultDrmSessionManager` constructors, use
+        `DefaultDrmSessionManager.Builder` instead.
 
 ### 1.1.0-alpha01 (2023-05-10)
 
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSessionManager.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSessionManager.java
index 05ab52a039..4fd04f9c57 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSessionManager.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSessionManager.java
@@ -322,89 +322,6 @@ public class DefaultDrmSessionManager implements DrmSessionManager {
 
   /* package */ @Nullable volatile MediaDrmHandler mediaDrmHandler;
 
-  /**
-   * @param uuid The UUID of the drm scheme.
-   * @param exoMediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
-   * @param callback Performs key and provisioning requests.
-   * @param keyRequestParameters An optional map of parameters to pass as the last argument to
-   *     {@link ExoMediaDrm#getKeyRequest(byte[], List, int, HashMap)}. May be null.
-   * @deprecated Use {@link Builder} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  public DefaultDrmSessionManager(
-      UUID uuid,
-      ExoMediaDrm exoMediaDrm,
-      MediaDrmCallback callback,
-      @Nullable HashMap<String, String> keyRequestParameters) {
-    this(
-        uuid,
-        exoMediaDrm,
-        callback,
-        keyRequestParameters == null ? new HashMap<>() : keyRequestParameters,
-        /* multiSession= */ false,
-        INITIAL_DRM_REQUEST_RETRY_COUNT);
-  }
-
-  /**
-   * @param uuid The UUID of the drm scheme.
-   * @param exoMediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
-   * @param callback Performs key and provisioning requests.
-   * @param keyRequestParameters An optional map of parameters to pass as the last argument to
-   *     {@link ExoMediaDrm#getKeyRequest(byte[], List, int, HashMap)}. May be null.
-   * @param multiSession A boolean that specify whether multiple key session support is enabled.
-   *     Default is false.
-   * @deprecated Use {@link Builder} instead.
-   */
-  @SuppressWarnings("deprecation")
-  @Deprecated
-  public DefaultDrmSessionManager(
-      UUID uuid,
-      ExoMediaDrm exoMediaDrm,
-      MediaDrmCallback callback,
-      @Nullable HashMap<String, String> keyRequestParameters,
-      boolean multiSession) {
-    this(
-        uuid,
-        exoMediaDrm,
-        callback,
-        keyRequestParameters == null ? new HashMap<>() : keyRequestParameters,
-        multiSession,
-        INITIAL_DRM_REQUEST_RETRY_COUNT);
-  }
-
-  /**
-   * @param uuid The UUID of the drm scheme.
-   * @param exoMediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
-   * @param callback Performs key and provisioning requests.
-   * @param keyRequestParameters An optional map of parameters to pass as the last argument to
-   *     {@link ExoMediaDrm#getKeyRequest(byte[], List, int, HashMap)}. May be null.
-   * @param multiSession A boolean that specify whether multiple key session support is enabled.
-   *     Default is false.
-   * @param initialDrmRequestRetryCount The number of times to retry for initial provisioning and
-   *     key request before reporting error.
-   * @deprecated Use {@link Builder} instead.
-   */
-  @Deprecated
-  public DefaultDrmSessionManager(
-      UUID uuid,
-      ExoMediaDrm exoMediaDrm,
-      MediaDrmCallback callback,
-      @Nullable HashMap<String, String> keyRequestParameters,
-      boolean multiSession,
-      int initialDrmRequestRetryCount) {
-    this(
-        uuid,
-        new ExoMediaDrm.AppManagedProvider(exoMediaDrm),
-        callback,
-        keyRequestParameters == null ? new HashMap<>() : keyRequestParameters,
-        multiSession,
-        /* useDrmSessionsForClearContentTrackTypes= */ new int[0],
-        /* playClearSamplesWithoutKeys= */ false,
-        new DefaultLoadErrorHandlingPolicy(initialDrmRequestRetryCount),
-        DEFAULT_SESSION_KEEPALIVE_MS);
-  }
-
   private DefaultDrmSessionManager(
       UUID uuid,
       ExoMediaDrm.Provider exoMediaDrmProvider,