Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply ClearKey DRM invalid URL workaround for Android 13 and newer #837

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Apply ClearKey DRM invalid URL workaround for Android 13 and newer #837

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad7b12e
Apply workaround for Android 13 and newer
superjohan Nov 24, 2023
8e4ffe7
Add release note for clearkey workaround change
icbaker Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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.
  • Loading branch information
@superjohan @icbaker
superjohan authored and icbaker committed Nov 27, 2023
commit ad7b12e56fecac85a073251965bdbe449d2ec0db
2 changes: 1 addition & 1 deletion libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/FrameworkMediaDrm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down