From 5f5a62133541a26a1c9d65d32bdeee8ca1bc6cf1 Mon Sep 17 00:00:00 2001
From: Alex Hong <rurumihong@google.com>
Date: Tue, 4 May 2021 23:13:56 +0800
Subject: [PATCH] Remove android.hardware.drm@1.0 HAL services

The following interfaces are deprecated for Target FCM version 5
  android.hardware.drm@1.0::ICryptoFactory/default
  android.hardware.drm@1.0::IDrmFactory/default

Test: $ m check-vintf-all
      The device is bootable.
Bug: 186538652
Change-Id: I0babd05f17281406af10e4ea2435aca598910d36
---
 device.mk    |  2 --
 manifest.xml | 17 -----------------
 2 files changed, 19 deletions(-)

diff --git a/device.mk b/device.mk
index c26a5e38..a79aaedf 100644
--- a/device.mk
+++ b/device.mk
@@ -436,8 +436,6 @@ PRODUCT_PACKAGES += \
 
 # WideVine modules
 PRODUCT_PACKAGES += \
-	android.hardware.drm@1.0-impl \
-	android.hardware.drm@1.0-service \
 	android.hardware.drm@1.4-service.clearkey \
 	android.hardware.drm@1.4-service.widevine \
 	liboemcrypto \
diff --git a/manifest.xml b/manifest.xml
index 4f56564e..dd5af4ef 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -75,23 +75,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.3::ICryptoFactory/clearkey</fqname>
-        <fqname>@1.3::IDrmFactory/clearkey</fqname>
-        <fqname>@1.3::ICryptoFactory/widevine</fqname>
-        <fqname>@1.3::IDrmFactory/widevine</fqname>
-    </hal>
     <hal format = "hidl">
         <name>android.hardware.dumpstate</name>
         <transport>hwbinder</transport>