From f372e7e8320eb6b62da367efb19958d687e6b034 Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Mon, 24 Apr 2023 17:35:39 +0800
Subject: [PATCH] Upgrade VINTF Target FCM level from 7 to 8

Target FCM level 8 requires the newer version of the following HALs:
  android.hardware.boot
Add the older version of these HALs into the customized product FCM

Remove below from customized product FCM and follow general rule:
  android.hardware.biometrics.face
  android.hardware.biometrics.fingerprint
  android.hardware.contexthub
  android.hardware.radio.config

Bug: 310792617
Change-Id: Ide9a0fd3cab4f6b23179b93d4a814eac3ede7b67
---
 device_framework_matrix_product.xml | 32 +++++------------------------
 manifest.xml                        |  2 +-
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 48992a5..88b6ef0 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,23 +1,9 @@
-<compatibility-matrix version="1.0" type="framework" level="7">
-    <hal format="aidl" optional="true">
-        <name>android.hardware.biometrics.face</name>
+<compatibility-matrix version="1.0" type="framework" level="8">
+    <hal format="hidl" optional="true">
+        <name>android.hardware.boot</name>
+        <version>1.2</version>
         <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>
-        <interface>
-            <name>IContextHub</name>
+            <name>IBootControl</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -37,14 +23,6 @@
             <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.xml b/manifest.xml
index e129014..0cbae0f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="7">
+<manifest version="1.0" type="device" target-level="8">
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>