commit d1ed6a6221b80e906e2bf0e7a5622b4bbb16d6f8
author Yongqin Liu <yongqin.liu@linaro.org> Mon Oct 10 18:08:12 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 10 18:08:12 2022 +0000
tree 28f03769ccfc586932f8818c275fc8df4823dd50
parent 178621d68d38f4768369092250491993ed1f5472
parent 1a3678b99cfabe31f47a47e1cd0b2143e3b87410

x15: Update PRODUCT_SHIPPING_API_LEVEL to 31 and FCM to 6 am: 1a3678b99c

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/2243382

Change-Id: I92e5e483db6112cd75c3791397ae2be62adb6685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

compatibility_matrix.xml

diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index 847f781..73d39a9 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -8,14 +8,6 @@
         </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>
         <interface>

device.mk

diff --git a/device.mk b/device.mk
index 5a34597..94bdd19 100644
--- a/device.mk
+++ b/device.mk
@@ -27,7 +27,7 @@
 # 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 @@
 	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 \

manifest.xml

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>