From d23e85dd357ed9152db43d4f98ba69ad447af19d 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
  android.hardware.neuralnetworks
  android.hardware.cas
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.radio.config

Bug: 277188108
Change-Id: Iaec28d5ca254029daf126393e77fa997a8c6ce92
---
 device_framework_matrix_product.xml | 32 +++++++++++++++--------------
 manifest.xml                        |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 811c2885..749d6daa 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,15 +1,17 @@
-<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>
+            <name>IBootControl</name>
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>android.hardware.biometrics.fingerprint</name>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.cas</name>
+        <version>1.2</version>
         <interface>
-            <name>IFingerprint</name>
+            <name>IMediaCasService</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -29,6 +31,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.neuralnetworks</name>
+        <version>1.3</version>
+        <interface>
+            <name>IDevice</name>
+            <instance>google-armnn</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.radio</name>
         <version>1.2</version>
@@ -37,14 +47,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 fcc6aae0..e5678026 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>