Merge pull request #837 from superjohan:fix/android-14-clearkey

PiperOrigin-RevId: 585639025 (cherry picked from commit 5f27b18)
androidx · Jan 8, 2024 · db64831 · db64831
1 parent 19ee787
commit db64831
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -246,7 +246,7 @@ public KeyRequest getKeyRequest(
   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 {