From ad7b12e56fecac85a073251965bdbe449d2ec0db Mon Sep 17 00:00:00 2001 From: Johan Halin Date: Fri, 24 Nov 2023 12:15:46 +0200 Subject: [PATCH 1/2] Apply workaround for Android 13 and newer At least some Android 14 devices still have the same invalid URL issue when using ClearKey DRM, so might as well apply the check to newer versions of Android as well. --- .../java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1cfb5d8dea0..e3d51fffc85 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 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 { From 8e4ffe7d578bfb56ef05b9906a1e56c6afcd643f Mon Sep 17 00:00:00 2001 From: Ian Baker Date: Mon, 27 Nov 2023 10:41:37 +0000 Subject: [PATCH 2/2] Add release note for clearkey workaround change --- RELEASENOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 16229db8c6d..d7df013784c 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -53,6 +53,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: