commit 9b0f15d5e19085d070db5f5d6778deefb44ddd02
author Anna Trostanetski <atrost@google.com> Mon Mar 23 11:58:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 23 11:58:12 2020 +0000
tree bd502caa2611bea8302a34225a7bd396ff8fca57
parent 9b56a5a538d249ef144b5cc8802887527112642d
parent 593dbfc1541c7905396c834a24613c93fdbe55f7

Merge "Revert "Drop GNSS1.1 and Thermal1.0"" into rvc-dev

compatibility_matrices/compatibility_matrix.4.xml

diff --git a/compatibility_matrices/compatibility_matrix.4.xml b/compatibility_matrices/compatibility_matrix.4.xml
index e5e012c..01ec172 100644
--- a/compatibility_matrices/compatibility_matrix.4.xml
+++ b/compatibility_matrices/compatibility_matrix.4.xml
@@ -181,6 +181,12 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.gnss</name>
+        <!--
+         - Both versions are listed here as a workaround for libvintf since 2.0 extends 1.1.
+         - Devices launched with Q must support gnss@2.0, see VtsTrebleVendorVintfTest
+         - test DeviceManifestTest#GnssHalVersionCompatibility.
+        -->
+        <version>1.1</version>
         <version>2.0</version>
         <interface>
             <name>IGnss</name>
@@ -423,6 +429,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.thermal</name>
+        <version>1.0-1</version>
         <version>2.0</version>
         <interface>
             <name>IThermal</name>

compatibility_matrices/compatibility_matrix.current.xml

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index c5a9102..51c6546 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -209,6 +209,12 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.gnss</name>
+        <!--
+         - Both versions are listed here as a workaround for libvintf since 2.0 extends 1.1.
+         - Devices launched with Q must support gnss@2.0, see VtsTrebleVendorVintfTest
+         - test DeviceManifestTest#GnssHalVersionCompatibility.
+        -->
+        <version>1.1</version>
         <version>2.0-1</version>
         <interface>
             <name>IGnss</name>
@@ -464,6 +470,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.thermal</name>
+        <version>1.0</version>
         <version>2.0</version>
         <interface>
             <name>IThermal</name>