| commit | 38dfcf3d6580114c3384906f7522d9814a1bf3e7 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Tue Mar 09 00:43:07 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 00:43:07 2021 +0000 |
| tree | 85dc4202289904918f3e07e04e625a06aa21011b | |
| parent | a289b9fd36e0e85226e207f4648da781c7547352 [diff] | |
| parent | a0c714760f1440e4ad877564b0dae8e07426a72b [diff] |
Merge "Retroactively add identity V2 to 5.xml." am: 98bdd3c979 am: b588fc9f24 am: a0c714760f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1606757 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia74d2b9c847f168b86fcdf0a3b48208bec271081
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>