From d1fc766d4d483119b44c5d41c21d0149403e69ce Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 14 Mar 2018 14:17:30 -0700
Subject: [PATCH] Remove drm@1.1::I*/default and widevine from the manifest.

1.1 clearkey is kept using the old format so that OTA
still works (otherwise, the old libvintf on the device
won't be able to see that 1.1 clearkey is on the device,
and will fail OTA.)

Use the latest <fqname> syntax.

Test: build device
Test: lshal
Test: play Google Play videos
Test: vts_treble_vintf_test DRM passes
Bug: 73556059

Change-Id: I7ef58838dbff0e28e55de2a9e9404571d2006af6
---
 manifest.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 5745cb1b..2c00afc8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -86,16 +86,16 @@
         <version>1.1</version>
         <interface>
             <name>ICryptoFactory</name>
-            <instance>default</instance>
-            <instance>widevine</instance>
             <instance>clearkey</instance>
         </interface>
         <interface>
             <name>IDrmFactory</name>
-            <instance>default</instance>
-            <instance>widevine</instance>
             <instance>clearkey</instance>
         </interface>
+        <fqname>@1.0::ICryptoFactory/default</fqname>
+        <fqname>@1.0::IDrmFactory/default</fqname>
+        <fqname>@1.0::ICryptoFactory/widevine</fqname>
+        <fqname>@1.0::IDrmFactory/widevine</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.dumpstate</name>