Merge changes from topic "ship_api_34_zumapro" into main

* changes:
  Upgrade PRODUCT_SHIPPING_API_LEVEL to 34
  Upgrade VINTF Target FCM level from 7 to 8
This commit is contained in:
Cyan Hsieh 2023-11-23 08:21:05 +00:00 committed by Android (Google) Code Review
commit 644cdb70ae
3 changed files with 7 additions and 30 deletions

View file

@ -334,8 +334,7 @@ DEVICE_MATRIX_FILE := \
DEVICE_PACKAGE_OVERLAYS += device/google/zumapro/overlay
# This will be updated to 34 (Android U) for shipping
PRODUCT_SHIPPING_API_LEVEL := 33
PRODUCT_SHIPPING_API_LEVEL := 34
# RKP VINTF
-include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk

View file

@ -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>

View file

@ -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>