From 48348df58ad7ebbe13b842a3daa9db21a67c75ad Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 23 May 2023 16:05:01 +0100
Subject: [PATCH] Remove deprecated `OfflineLicenseHelper` constructor

Use the non-deprecated constructor instead.

#minor-release

PiperOrigin-RevId: 534426655
---
 RELEASENOTES.md                               |  3 +++
 .../exoplayer/drm/OfflineLicenseHelper.java   | 20 -------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 180750a100..d093fea8aa 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -95,6 +95,9 @@
     *   Remove deprecated `DownloadManager` constructor, use the constructor
         that takes an `Executor` instead.
     *   Remove deprecated `Cue` constructors, use `Cue.Builder` instead.
+    *   Remove deprecated `OfflineLicenseHelper` constructor, use
+        `OfflineLicenseHelper(DefaultDrmSessionManager,
+        DrmSessionEventListener.EventDispatcher)` instead.
     *   Remove `ExoPlayer.setHandleWakeLock(boolean)`, use `setWakeMode(int)`
         instead.
     *   Remove deprecated
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/OfflineLicenseHelper.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/OfflineLicenseHelper.java
index 546da70fbe..35dbcd4355 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/OfflineLicenseHelper.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/OfflineLicenseHelper.java
@@ -34,7 +34,6 @@ import androidx.media3.exoplayer.drm.DrmSession.DrmSessionException;
 import androidx.media3.exoplayer.source.MediaSource.MediaPeriodId;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import org.checkerframework.checker.nullness.compatqual.NullableType;
 
@@ -128,25 +127,6 @@ public final class OfflineLicenseHelper {
         eventDispatcher);
   }
 
-  /**
-   * @deprecated Use {@link #OfflineLicenseHelper(DefaultDrmSessionManager,
-   *     DrmSessionEventListener.EventDispatcher)} instead.
-   */
-  @Deprecated
-  public OfflineLicenseHelper(
-      UUID uuid,
-      ExoMediaDrm.Provider mediaDrmProvider,
-      MediaDrmCallback callback,
-      @Nullable Map<String, String> optionalKeyRequestParameters,
-      DrmSessionEventListener.EventDispatcher eventDispatcher) {
-    this(
-        new DefaultDrmSessionManager.Builder()
-            .setUuidAndExoMediaDrmProvider(uuid, mediaDrmProvider)
-            .setKeyRequestParameters(optionalKeyRequestParameters)
-            .build(callback),
-        eventDispatcher);
-  }
-
   /**
    * Constructs an instance. Call {@link #release()} when the instance is no longer required.
    *