From 22136b7e4a8ef69394e08ea4ab0e177e8b4eaab7 Mon Sep 17 00:00:00 2001
From: Jeff Tinker <jtinker@google.com>
Date: Mon, 5 Nov 2018 15:04:17 -0800
Subject: msm8996-common: Enable clearkey drm plugin v1.2

test: android.media.cts.MediaDrmClearkeyTest#testOfflineKeyManagement

bug: 117570956
bug: 110838441
bug: 116252891
Change-Id: Ie9373543ef416e718a70e75d95bf5b15a2852705
---
 manifest.xml | 4 ++--
 msm8996.mk   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index c2fd2e7..2c5b4a8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -93,8 +93,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
             <instance>widevine</instance>
         </interface>
-        <fqname>@1.1::ICryptoFactory/clearkey</fqname>
-        <fqname>@1.1::IDrmFactory/clearkey</fqname>
+        <fqname>@1.2::ICryptoFactory/clearkey</fqname>
+        <fqname>@1.2::IDrmFactory/clearkey</fqname>
         <fqname>@1.1::ICryptoFactory/widevine</fqname>
         <fqname>@1.1::IDrmFactory/widevine</fqname>
     </hal>
diff --git a/msm8996.mk b/msm8996.mk
index 5d6d60e..dbea489 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -190,7 +190,8 @@ PRODUCT_PACKAGES += \
 # DRM
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
-    android.hardware.drm@1.0-service
+    android.hardware.drm@1.0-service \
+    android.hardware.drm@1.2-service.clearkey
 
 # For config.fs
 PRODUCT_PACKAGES += \
-- 
cgit v1.2.3