commit 8db59c363b1cf052a040746689e231be9a33efca
author Slava Shklyaev <slavash@google.com> Tue Mar 17 12:27:31 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 17 12:27:31 2020 +0000
tree 70260ea28be06346e264a2465064cfd5c921e47d
parent 326e2454d93892606808deb50a71293fafc370c3
parent d09c0eef0b1c44c471884b74ab1c23d4919ba7e0

Merge changes from topics "executeFenced_tests", "nnapi-decouple-1.2"

* changes:
  NNAPI VTS: decouple 1.2 tests from 1.3 types
  Add tests to make sure executeFenced validate unspecified output shapes
  Add more tests exercising IPreparedModel::executeFenced API

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 21459b7..fea5e6f 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -235,6 +235,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>android.hardware.identity</name>
+        <interface>
+            <name>IIdentityCredentialStore</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.ir</name>
         <version>1.0</version>