From 17ff725cfa6ad0bba0e3d76f6883f08aeb34b2e8 Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Mon, 25 Nov 2019 22:25:41 -0800
Subject: [PATCH] davinci: Enable v1.3 drm plugins

Bug: 139134043
Test: MediaDrmTest
Change-Id: I7453b035ca29c7ee889d03de0d55e6d947b3cb77
---
 configs/hidl/manifest.xml | 2 --
 device.mk                 | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/configs/hidl/manifest.xml b/configs/hidl/manifest.xml
index cce77de..8911a94 100644
--- a/configs/hidl/manifest.xml
+++ b/configs/hidl/manifest.xml
@@ -85,9 +85,7 @@
         <fqname>@1.0::IDrmFactory/default</fqname>
         <fqname>@1.1::ICryptoFactory/wfdhdcp</fqname>
         <fqname>@1.1::IDrmFactory/wfdhdcp</fqname>
-        <fqname>@1.2::ICryptoFactory/clearkey</fqname>
         <fqname>@1.2::ICryptoFactory/widevine</fqname>
-        <fqname>@1.2::IDrmFactory/clearkey</fqname>
         <fqname>@1.2::IDrmFactory/widevine</fqname>
     </hal>
     <hal format="hidl">
diff --git a/device.mk b/device.mk
index 5948764..7720642 100644
--- a/device.mk
+++ b/device.mk
@@ -146,7 +146,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
     android.hardware.drm@1.0-service \
-    android.hardware.drm@1.2-service.clearkey
+    android.hardware.drm@1.3-service.clearkey
 
 # Fingerprint
 PRODUCT_PACKAGES += \