Upgrade VINTF Target FCM level from 6 to 7
Target FCM level 7 requires the newer version of the following HALs.
1. android.hardware.biometrics.face
2. android.hardware.biometrics.fingerprint
3. android.hardware.dumpstate
4. android.hardware.gnss
5. android.hardware.radio.config
Temporarily add the older version of these HALs into the customized product FCM
to claim we are still using the older version and bypass the build breakage.
We will check about how to handle these HALs later.
Test: m check-vintf-all
run vts -m vts_treble_vintf_vendor_test
Bug: 207076973
Change-Id: I4582385b4d0588ce7310d6ecf59ce0834b7c95c2
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 64e2744..bce7e68 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,4 +1,18 @@
-<compatibility-matrix version="1.0" type="framework" level="6">
+<compatibility-matrix version="1.0" type="framework" level="7">
+ <hal format="aidl" optional="true">
+ <name>android.hardware.biometrics.face</name>
+ <interface>
+ <name>IFace</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="aidl" optional="true">
+ <name>android.hardware.biometrics.fingerprint</name>
+ <interface>
+ <name>IFingerprint</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
<hal format="aidl">
<name>android.hardware.contexthub</name>
<version>1</version>
@@ -7,6 +21,21 @@
<instance>default</instance>
</interface>
</hal>
+ <hal format="hidl">
+ <name>android.hardware.dumpstate</name>
+ <version>1.1</version>
+ <interface>
+ <name>IDumpstateDevice</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal format="aidl">
+ <name>android.hardware.gnss</name>
+ <interface>
+ <name>IGnss</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
<hal format="aidl">
<name>android.hardware.graphics.composer3</name>
<version>1</version>
@@ -23,6 +52,14 @@
<instance>slot2</instance>
</interface>
</hal>
+ <hal format="hidl" optional="true">
+ <name>android.hardware.radio.config</name>
+ <version>1.1</version>
+ <interface>
+ <name>IRadioConfig</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
<hal format="aidl" optional="true">
<name>android.hardware.vibrator</name>
<version>2</version>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index dc1f72b..97afb6b 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="6">
+<manifest version="1.0" type="device" target-level="7">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
@@ -160,5 +160,4 @@
<instance>default</instance>
</interface>
</hal>
- <kernel target-level="6"/>
</manifest>
diff --git a/manifest.xml b/manifest.xml
index 72da40d..832b764 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="6">
+<manifest version="1.0" type="device" target-level="7">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
@@ -111,5 +111,4 @@
<instance>default</instance>
</interface>
</hal>
- <kernel target-level="6"/>
</manifest>
