Revert "Drop GNSS1.1 and Thermal1.0"
Revert "Check unused HALs when system ext matrix exists."
Revert "Use HIDL metadata for deprecation check"
Revert submission 10745362-check_unused
Reason for revert: Droidcop: Potential culprit for Bug 152161259
Reverted Changes:
I92cd7ce1c:Use HIDL metadata for deprecation check
I2b9492eec:Fix check deprecation to use Hidl Metadata.
I6e40a49d5:Add no unused hals test
Ia352a979d:Delete unused GNSS@2.0 Thermal@2.0 checks
I1c0ef715b:checkUnusedHals: use hidl metadata
I44a5240e8:Check unused HALs on device with target FCM versio...
I5c5ec4891:Check unused HALs when system ext matrix exists.
I17894c025:Add libhidlmetadata_headers
I2c7cbf8f5:Drop GNSS1.1 and Thermal1.0
Change-Id: Id1174fec4b5a8dbab2078470d89943935aa1c4be
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>
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 1861b1c..de1ee84 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -197,6 +197,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>
@@ -445,6 +451,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.thermal</name>
+ <version>1.0</version>
<version>2.0</version>
<interface>
<name>IThermal</name>