Merge "Add <interface> / <instance> to fwk compat mat" into oc-dev am: 0fefa392f7

am: 8c25616954

Change-Id: I66e3b7be3dff6d156e6667856369374335860a19

diff --cc compatibility_matrix.xml
index 41c42e1,92244a9..0f42a02
--- 1/compatibility_matrix.xml
--- 2/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@@ -6,18 -10,18 +10,26 @@@
      <hal format="hidl" optional="false">
          <name>android.hardware.audio.effect</name>
          <version>2.0</version>
+         <interface>
+             <name>IEffectsFactory</name>
+             <instance>default</instance>
+         </interface>
      </hal>
      <hal format="hidl" optional="true">
 +        <name>android.hardware.automotive.evs</name>
 +        <version>1.0</version>
 +    </hal>
 +    <hal format="hidl" optional="true">
 +        <name>android.hardware.automotive.vehicle</name>
 +        <version>2.1</version>
 +    </hal>
 +    <hal format="hidl" optional="true">
          <name>android.hardware.biometrics.fingerprint</name>
          <version>2.1</version>
+         <interface>
+             <name>IBiometricsFingerprint</name>
+             <instance>default</instance>
+         </interface>
      </hal>
      <hal format="hidl" optional="true">
          <name>android.hardware.bluetooth</name>
@@@ -90,14 -162,18 +170,22 @@@
      <hal format="hidl" optional="true">
          <name>android.hardware.nfc</name>
          <version>1.0</version>
+         <interface>
+             <name>INfc</name>
+             <instance>default</instance>
+         </interface>
      </hal>
      <hal format="hidl" optional="true">
 +        <name>android.hardware.oemlock</name>
 +        <version>1.0</version>
 +    </hal>
 +    <hal format="hidl" optional="true">
          <name>android.hardware.power</name>
          <version>1.0</version>
+         <interface>
+             <name>IPower</name>
+             <instance>default</instance>
+         </interface>
      </hal>
      <hal format="hidl" optional="true">
          <name>android.hardware.radio</name>
@@@ -130,13 -246,17 +258,21 @@@
      <hal format="hidl" optional="true">
          <name>android.hardware.vr</name>
          <version>1.0</version>
+         <interface>
+             <name>IVr</name>
+             <instance>default</instance>
+         </interface>
      </hal>
      <hal format="hidl" optional="true">
 +        <name>android.hardware.weaver</name>
 +        <version>1.0</version>
 +    </hal>
 +    <hal format="hidl" optional="true">
          <name>android.hardware.wifi</name>
          <version>1.0</version>
+         <interface>
+             <name>IWifi</name>
+             <instance>default</instance>
+         </interface>
      </hal>
  </compatibility-matrix>