From e392084c4da45a43e0e59f6cf582ab5347484744 Mon Sep 17 00:00:00 2001
From: ktrajkovski <ktrajkovski@google.com>
Date: Fri, 28 Jun 2024 03:34:58 -0700
Subject: [PATCH] Remove deprecated
 DrmSessionEventListener.onDrmSessionAcquired method.

#cherrypick

PiperOrigin-RevId: 647620751
---
 RELEASENOTES.md                                     |  1 +
 .../exoplayer/drm/DrmSessionEventListener.java      | 13 +------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 34058b8916..e1d44e718b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -59,6 +59,7 @@
 *   Remove deprecated symbols:
     *   Remove deprecated `Player#hasPrevious` method. Use
         `Player#hasPreviousMediaItem()` instead.
+    *   Remove deprecated `DrmSessionEventListener.onDrmSessionAcquired` method.
 
 ## 1.4
 
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionEventListener.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionEventListener.java
index 72a7f7cf35..66e92fe9fe 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionEventListener.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionEventListener.java
@@ -30,12 +30,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 @UnstableApi
 public interface DrmSessionEventListener {
 
-  /**
-   * @deprecated Implement {@link #onDrmSessionAcquired(int, MediaPeriodId, int)} instead.
-   */
-  @Deprecated
-  default void onDrmSessionAcquired(int windowIndex, @Nullable MediaPeriodId mediaPeriodId) {}
-
   /**
    * Called each time a drm session is acquired.
    *
@@ -160,18 +154,13 @@ public interface DrmSessionEventListener {
       }
     }
 
-    /**
-     * Dispatches {@link #onDrmSessionAcquired(int, MediaPeriodId, int)} and {@link
-     * #onDrmSessionAcquired(int, MediaPeriodId)}.
-     */
-    @SuppressWarnings("deprecation") // Calls deprecated listener method.
+    /** Dispatches {@link #onDrmSessionAcquired(int, MediaPeriodId, int)}. */
     public void drmSessionAcquired(@DrmSession.State int state) {
       for (ListenerAndHandler listenerAndHandler : listenerAndHandlers) {
         DrmSessionEventListener listener = listenerAndHandler.listener;
         postOrRun(
             listenerAndHandler.handler,
             () -> {
-              listener.onDrmSessionAcquired(windowIndex, mediaPeriodId);
               listener.onDrmSessionAcquired(windowIndex, mediaPeriodId, state);
             });
       }