From a13b0354b5ac73109880f3ee0a794acea641dd9e Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Wed, 24 Feb 2021 15:47:41 -0800
Subject: [PATCH] Retroactively add identity V2 to 5.xml.

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 Andorid R branches, the matrix implicitly
specifies V1. SingleManifestTest.ManifestAidlHalsServed has an exemption
for this.

Bug: 178458001
Test: pass
Change-Id: Iaf6947a31cc34d81d3a1d6655b85af00baab90f3
---
 compatibility_matrices/compatibility_matrix.5.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compatibility_matrices/compatibility_matrix.5.xml b/compatibility_matrices/compatibility_matrix.5.xml
index e772b6fe1d..b089e246f7 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>