commit f4a1fb284e593f3f7ba1ea338107fbb19475a223
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 26 20:00:15 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 26 20:00:15 2018 +0000
tree 5858c5ad07e2fb2615a891f09bb9d6262bdb71bb
parent d554979f59cb222125bd31cac60ea25c98e0d158
parent 21dbcfd27d57f0c44ef5db1c858ddbc9251a2446

Merge "Revert "Remove drm@1.1::I*/default and widevine from the manifest."" into pi-dev

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 0700252..9e54b83 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>