From 6f2a2d2117a3e9c9a3d1b90a3789e9bc043661f0 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Sat, 13 Nov 2021 15:00:50 +0800
Subject: [PATCH] update drm hidl 1.0 -> 1.2

---
 android.hardware.drm@1.2-service.clearkey.xml | 23 +++++++++++++++++++
 manifest.xml                                  | 15 ------------
 redroid.mk                                    |  7 +++---
 3 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 android.hardware.drm@1.2-service.clearkey.xml

diff --git a/android.hardware.drm@1.2-service.clearkey.xml b/android.hardware.drm@1.2-service.clearkey.xml
new file mode 100644
index 0000000..16cba11
--- /dev/null
+++ b/android.hardware.drm@1.2-service.clearkey.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.drm</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.2::ICryptoFactory/clearkey</fqname>
+        <fqname>@1.2::IDrmFactory/clearkey</fqname>
+    </hal>
+</manifest>
diff --git a/manifest.xml b/manifest.xml
index 4612f08..56d4188 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -26,21 +26,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.drm</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ICryptoFactory</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IDrmFactory</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.2::ICryptoFactory/clearkey</fqname>
-        <fqname>@1.2::IDrmFactory/clearkey</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.gatekeeper</name>
         <transport>hwbinder</transport>
diff --git a/redroid.mk b/redroid.mk
index 2cf6fc9..122fa19 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -92,9 +92,7 @@ PRODUCT_PACKAGES += \
     android.hardware.audio@4.0-impl \
     android.hardware.audio.effect@4.0-impl \
     android.hardware.configstore@1.1-service \
-    android.hardware.drm@1.0-service \
-    android.hardware.drm@1.0-impl \
-    android.hardware.drm@1.2-service.clearkey \
+    android.hardware.drm@1.2-service-lazy.clearkey \
     android.hardware.gatekeeper@1.0-service \
     android.hardware.gatekeeper@1.0-impl \
     android.hardware.graphics.allocator@2.0-service \
@@ -106,6 +104,9 @@ PRODUCT_PACKAGES += \
     android.hardware.keymaster@3.0-service \
     android.hardware.keymaster@3.0-impl \
 
+
+DEVICE_MANIFEST_FILE += device/redroid/android.hardware.drm@1.2-service.clearkey.xml
+
 USE_XML_AUDIO_POLICY_CONF := 1
 
 PRODUCT_COPY_FILES += \