From a701c2f03561dc2fed8c030bd2420f469af0dcb4 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 15 Apr 2024 03:40:06 -0700 Subject: [PATCH] Tighten clearkey `"default.url"` workaround This ensures it only applies to known-problematic versions of the clearkey plugin. PiperOrigin-RevId: 624901919 --- .../media3/exoplayer/drm/FrameworkMediaDrm.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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 da3fa69210..873fd2849a 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 @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.UUID; /** An {@link ExoMediaDrm} implementation that wraps the framework {@link MediaDrm}. */ @@ -242,15 +243,18 @@ public final class FrameworkMediaDrm implements ExoMediaDrm { return new KeyRequest(requestData, licenseServerUrl, requestType); } - private static String adjustLicenseServerUrl(String licenseServerUrl) { + private String adjustLicenseServerUrl(String licenseServerUrl) { if (MOCK_LA_URL.equals(licenseServerUrl)) { return ""; - } else if (Util.SDK_INT >= 33 && "https://default.url".equals(licenseServerUrl)) { - // Work around b/247808112 - return ""; - } else { - return licenseServerUrl; } + if (Util.SDK_INT >= 33 && "https://default.url".equals(licenseServerUrl)) { + // Work around b/247808112 + String pluginVersion = getPropertyString("version"); + if (Objects.equals(pluginVersion, "1.2") || Objects.equals(pluginVersion, "aidl-1")) { + return ""; + } + } + return licenseServerUrl; } @UnstableApi