From 1a3678b99cfabe31f47a47e1cd0b2143e3b87410 Mon Sep 17 00:00:00 2001
From: Yongqin Liu <yongqin.liu@linaro.org>
Date: Sun, 9 Oct 2022 17:26:53 +0800
Subject: x15: Update PRODUCT_SHIPPING_API_LEVEL to 31 and FCM to 6

Update PRODUCT_SHIPPING_API_LEVEL and FCM for hikey960 so they are
at 31 and 6 respectively.

Refered to the hikey960 change here:
    https://android-review.googlesource.com/c/device/linaro/hikey/+/1759050/1

Test: boot to homescreen

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: I57eb828c16a5d26eb8132edfd82f94a1076315be
---
 compatibility_matrix.xml |  8 --------
 device.mk                |  6 +-----
 manifest.xml             | 11 +----------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index 847f781..73d39a9 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -7,14 +7,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
-        <name>android.frameworks.schedulerservice</name>
-        <version>1.0</version>
-        <interface>
-            <name>ISchedulingPolicyService</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="false">
         <name>android.frameworks.sensorservice</name>
         <version>1.0</version>
diff --git a/device.mk b/device.mk
index 5a34597..94bdd19 100644
--- a/device.mk
+++ b/device.mk
@@ -27,7 +27,7 @@ PRODUCT_SOONG_NAMESPACES += \
 # Adjust the dalvik heap to be appropriate for a tablet.
 $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)
 
-PRODUCT_SHIPPING_API_LEVEL := 30
+PRODUCT_SHIPPING_API_LEVEL := 31
 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
 
 # Set custom settings
@@ -139,10 +139,6 @@ PRODUCT_COPY_FILES += \
 	frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
 	frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
 
-# Memtrack
-PRODUCT_PACKAGES += \
-	android.hardware.memtrack@1.0-impl \
-	android.hardware.memtrack@1.0-service \
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.opengles.version=131072 \
diff --git a/manifest.xml b/manifest.xml
index bd5ef26..5727775 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="5">
+<manifest version="1.0" type="device" target-level="6">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
@@ -79,13 +79,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.memtrack</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMemtrack</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
 </manifest>
-- 
cgit v1.2.3