| commit | b588fc9f24aaa39e936139ef5d87d398effb5bcf | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Mon Mar 08 23:38:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 08 23:38:10 2021 +0000 |
| tree | 8847d8051f3ec3fd1989c5c53dd7c138562433ad | |
| parent | e84d4ec9340c60690f809e3a79735a27bab5bbf3 [diff] | |
| parent | 98bdd3c979ddfc249e3f7b51d765a5b8d0ddafd2 [diff] |
Merge "Retroactively add identity V2 to 5.xml." am: 98bdd3c979 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1606757 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib9dc774e39d8d673ddc2ef4f301d962fe53552f3
diff --git a/compatibility_matrices/compatibility_matrix.5.xml b/compatibility_matrices/compatibility_matrix.5.xml index 96a3692..8e175f0 100644 --- a/compatibility_matrices/compatibility_matrix.5.xml +++ b/compatibility_matrices/compatibility_matrix.5.xml
@@ -256,6 +256,13 @@ </hal> <hal format="aidl" optional="true"> <name>android.hardware.identity</name> + <!-- + b/178458001: identity V2 is introduced in R, but Android R VINTF does not support AIDL + versions. Hence, we only specify identity V2 in compatibility_matrix.5.xml in Android S+ + branches. In Android R branches, the matrix implicitly specifies V1. + SingleManifestTest.ManifestAidlHalsServed has an exemption for this. + --> + <version>1-2</version> <interface> <name>IIdentityCredentialStore</name> <instance>default</instance>