From aa2da24f5f7387bbc5821a3e1c07fcfe47c3b670 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Thu, 12 Mar 2020 22:25:56 -0700
Subject: [PATCH] Drop GNSS1.1 and Thermal1.0

These two are added because checkUnusedHals does not check for
inheritance. These two HALs are considered deprecated and are dropped
from the current matrix.

They are dropped from matrix.4.xml too because
GnssHalVersionCompatibility and ThermalHalVersionCompatibility ensures
devices with target FCM version 4 must implement GNSS2.0 and thermal
2.0.

Bug: 131717099
Test: m check-vintf-all

Change-Id: I2c7cbf8f51925e55026a9f85382c8a22897eabaa
Merged-In: I2c7cbf8f51925e55026a9f85382c8a22897eabaa
---
 compatibility_matrices/compatibility_matrix.4.xml       | 7 -------
 compatibility_matrices/compatibility_matrix.current.xml | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/compatibility_matrices/compatibility_matrix.4.xml b/compatibility_matrices/compatibility_matrix.4.xml
index 01ec172d89..e5e012cbb3 100644
--- a/compatibility_matrices/compatibility_matrix.4.xml
+++ b/compatibility_matrices/compatibility_matrix.4.xml
@@ -181,12 +181,6 @@
     </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>
@@ -429,7 +423,6 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.thermal</name>
-        <version>1.0-1</version>
         <version>2.0</version>
         <interface>
             <name>IThermal</name>
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index fea5e6f291..cc4f0cd29c 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -181,12 +181,6 @@
     </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>
@@ -439,7 +433,6 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.thermal</name>
-        <version>1.0</version>
         <version>2.0</version>
         <interface>
             <name>IThermal</name>