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
This commit is contained in:
Yifan Hong 2020-03-12 22:25:56 -07:00
parent 3e9669ff69
commit dbadfe396b
2 changed files with 0 additions and 14 deletions

View file

@ -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>

View file

@ -197,12 +197,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-1</version>
<interface>
<name>IGnss</name>
@ -451,7 +445,6 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.thermal</name>
<version>1.0</version>
<version>2.0</version>
<interface>
<name>IThermal</name>