From db648316ed47a096b8ee489f47cd12a7a188410d Mon Sep 17 00:00:00 2001
From: Copybara-Service <copybara-worker@google.com>
Date: Mon, 27 Nov 2023 06:56:45 -0800
Subject: [PATCH] Merge pull request #837 from
 superjohan:fix/android-14-clearkey

PiperOrigin-RevId: 585639025
(cherry picked from commit 5f27b1821027d4cd086b87242e9e756a301b8e9a)
---
 RELEASENOTES.md                                                | 3 +++
 .../java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index f7d08c1b68..7d97e479d4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,6 +21,9 @@
 *   Text:
 *   Metadata:
 *   DRM:
+    *   Extend workaround for spurious ClearKey `https://default.url` license
+        URL to API 33+ (previously the workaround only applied on API 33
+        exactly) ([#837](https://github.com/androidx/media/pull/837)).
 *   Effect:
 *   Muxers:
 *   IMA extension:
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java
index 1cfb5d8dea..e3d51fffc8 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java
@@ -246,7 +246,7 @@ public final class FrameworkMediaDrm implements ExoMediaDrm {
   private static String adjustLicenseServerUrl(String licenseServerUrl) {
     if (MOCK_LA_URL.equals(licenseServerUrl)) {
       return "";
-    } else if (Util.SDK_INT == 33 && "https://default.url".equals(licenseServerUrl)) {
+    } else if (Util.SDK_INT >= 33 && "https://default.url".equals(licenseServerUrl)) {
       // Work around b/247808112
       return "";
     } else {