From 65a58ffcb5cf04344d451e64ac1012c2585bec97 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 | 2 ++ .../android/exoplayer2/drm/FrameworkMediaDrm.java | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 7da3c0a867..56c7404649 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -43,6 +43,8 @@ directly made with the `AnalyticsListener` interface. * IMA: Fix behavior when creating/releasing the player then releasing `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); + } }