From 763a5f027213a41a996d69ca3292d56308e5bd05 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 24 May 2024 09:04:24 -0700
Subject: [PATCH] Remove deprecated `DrmSessionManager.DUMMY` and getter method

Use `DRM_UNSUPPORTED` constant instead.

PiperOrigin-RevId: 636937592
---
 RELEASENOTES.md                                 |  2 ++
 .../media3/exoplayer/drm/DrmSessionManager.java | 17 -----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e25fc94949..e0978671aa 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -213,6 +213,8 @@
         `DashMediaSource.DEFAULT_FALLBACK_TARGET_LIVE_OFFSET_MS` instead.
     *   Remove `MediaCodecInfo.isSeamlessAdaptationSupported(Format, Format,
         boolean)`. Use `MediaCodecInfo.canReuseCodec(Format, Format)` instead.
+    *   Remove `DrmSessionManager.DUMMY` and `getDummyDrmSessionManager()`
+        method. Use `DrmSessionManager.DRM_UNSUPPORTED` instead.
 
 ## 1.4
 
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionManager.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionManager.java
index 0fab623522..6880f97d47 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionManager.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DrmSessionManager.java
@@ -71,23 +71,6 @@ public interface DrmSessionManager {
         }
       };
 
-  /**
-   * An instance that supports no DRM schemes.
-   *
-   * @deprecated Use {@link #DRM_UNSUPPORTED}.
-   */
-  @Deprecated DrmSessionManager DUMMY = DRM_UNSUPPORTED;
-
-  /**
-   * Returns {@link #DRM_UNSUPPORTED}.
-   *
-   * @deprecated Use {@link #DRM_UNSUPPORTED}.
-   */
-  @Deprecated
-  static DrmSessionManager getDummyDrmSessionManager() {
-    return DRM_UNSUPPORTED;
-  }
-
   /**
    * Acquires any required resources.
    *