commit 74978ebac9d59a5dff5493025de5dd12377f1693
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 20 18:33:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 20 18:33:17 2018 +0000
tree bceff853da6ef6a1ae72d8d2993925a8c15c24c3
parent 02d1bb7a9614f388885cc83a637ec88c845ce6fb
parent c893754c0d0b661f56d8d6e0621e9d1a27dcd043

Merge "Update Makefiles Missed In Previous Commits" into pi-dev

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index af15c78..b500ed4 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -182,7 +182,7 @@
         <interface>
             <name>IKeymasterDevice</name>
             <instance>default</instance>
-	    <!-- TODO: strongbox here? -->
+            <instance>strongbox</instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">
@@ -214,14 +214,6 @@
         </interface>
     </hal>
     <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.neuralnetworks</name>
         <version>1.0</version>
         <interface>
@@ -231,6 +223,14 @@
         </interface>
     </hal>
     <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>
         <interface>