From a0810856e71018551a077569e13c2d630adc622e Mon Sep 17 00:00:00 2001 From: tonihei Date: Wed, 27 Jun 2018 02:47:21 -0700 Subject: [PATCH] Add DRM workaround for Asus Zenfone 2. Issue: #4413 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=202277924 --- RELEASENOTES.md | 4 +++- .../android/exoplayer2/drm/FrameworkMediaDrm.java | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 42b9449410..39d1a78403 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -6,7 +6,9 @@ * Allow DrmInitData to carry a license server URL ([#3393](https://github.com/google/ExoPlayer/issues/3393)). * IMA: Fix behavior when creating/releasing the player then releasing - `ImaAdsLoader` ((#3879)[https://github.com/google/ExoPlayer/issues/3879]). + `ImaAdsLoader` ([#3879](https://github.com/google/ExoPlayer/issues/3879)). +* Fix issue playing DRM protected streams on Asus Zenfone 2 + ([#4403](https://github.com/google/ExoPlayer/issues/4413)). ### 2.8.2 ### diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java index a10c4c612e..c87e82f972 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java @@ -71,6 +71,9 @@ public final class FrameworkMediaDrm implements ExoMediaDrmSee GitHub issue #4413. + */ + private static boolean needsForceL3Workaround() { + return "ASUS_Z00AD".equals(Util.MODEL); + } }