From ad7b12e56fecac85a073251965bdbe449d2ec0db Mon Sep 17 00:00:00 2001 From: Johan Halin Date: Fri, 24 Nov 2023 12:15:46 +0200 Subject: [PATCH] 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 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 {