zenfone7: Update to Official 31.0210.0210.250 vendor

Change-Id: I4c5a2b454a2b8626848a0407937bbbd5455c0351
diff --git a/BoardConfig.mk b/BoardConfig.mk
index e2939c4..80a98b4 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -31,6 +31,7 @@
 BOARD_ROOT_EXTRA_FOLDERS += motor_fw1 motor_fw2
 
 #HIDL
+DEVICE_FRAMEWORK_MANIFEST_FILE += $(DEVICE_PATH)/framework_manifest.xml
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/vendor_framework_compatibility_matrix.xml
 
 # Kernel
diff --git a/device.mk b/device.mk
index faa945a..c928827 100755
--- a/device.mk
+++ b/device.mk
@@ -21,6 +21,7 @@
 #
 
 # VNDK
+PRODUCT_EXTRA_VNDK_VERSIONS := 30
 PRODUCT_TARGET_VNDK_VERSION := 30
 
 # Overlays
@@ -32,6 +33,12 @@
     FrameworksResVendorOverlay \
     SystemUIDeviceOverlay
 
+ifeq ($(ROM_BUILDTYPE),$(filter $(ROM_BUILDTYPE),GAPPS))
+# Android Auto
+PRODUCT_PACKAGES += \
+    AndroidAutoStub
+endif
+
 # Api
 PRODUCT_SHIPPING_API_LEVEL := 29
 
diff --git a/framework_manifest.xml b/framework_manifest.xml
new file mode 100644
index 0000000..de01b6f
--- /dev/null
+++ b/framework_manifest.xml
@@ -0,0 +1,12 @@
+<manifest version="1.0" type="framework">
+    <hal format="hidl">
+        <name>vendor.qti.hardware.qccsyshal</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IQccsyshal</name>
+            <instance>qccsyshal</instance>
+        </interface>
+        <fqname>@1.1::IQccsyshal/qccsyshal</fqname>
+    </hal>
+</manifest>
\ No newline at end of file
diff --git a/fstab.qcom b/fstab.qcom
index 0f3b012..524a06c 100755
--- a/fstab.qcom
+++ b/fstab.qcom
@@ -40,14 +40,14 @@
 product                                                 /product               ext4    ro,barrier=1,discard                                 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
 vendor                                                  /vendor                ext4    ro,barrier=1,discard                                 wait,slotselect,avb,logical,first_stage_mount
 odm                                                     /odm                   ext4    ro,barrier=1,discard                                 wait,slotselect,avb,logical,first_stage_mount
-/dev/block/by-name/metadata                             /metadata              ext4    noatime,nosuid,nodev,discard                         wait,formattable,wrappedkey,first_stage_mount
-/dev/block/bootdevice/by-name/userdata                  /data                  f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier    latemount,wait,check,formattable,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs
+/dev/block/by-name/metadata                             /metadata              ext4    noatime,nosuid,nodev,discard                         wait,check,formattable,wrappedkey,first_stage_mount
+/dev/block/bootdevice/by-name/userdata                 /data                   f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt latemount,wait,check,formattable,fileencryption=ice,wrappedkey,keydirectory=/metadata/vold/metadata_encryption,quota,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs
 /dev/block/bootdevice/by-name/persist                   /mnt/vendor/persist    ext4    noatime,nosuid,nodev,barrier=1                       wait
 /dev/block/bootdevice/by-name/misc                      /misc                  emmc    defaults                                             defaults
 /devices/platform/soc/8804000.sdhci/mmc_host*           /storage/sdcard1       vfat    nosuid,nodev                                         wait,voldmanaged=sdcard1:auto
-/devices/platform/soc/1da4000.ufshc_card/host*          /storage/sdcard1       vfat    nosuid,nodev                                         wait,voldmanaged=sdcard1:auto,encryptable=footer
+/devices/platform/soc/1da4000.ufshc_card/host*          /storage/sdcard1       vfat    nosuid,nodev                                         wait,voldmanaged=sdcard1:auto
 /devices/platform/soc/*.ssusb/*.dwc3/xhci-hcd.*.auto*   /storage/usbotg        vfat    nosuid,nodev                                         wait,voldmanaged=usbotg:auto
-/dev/block/bootdevice/by-name/spunvm                    /mnt/vendor/spunvm     vfat    rw,noatime,shortname=lower,uid=1000,gid=1000,dmask=007,fmask=007,context=u:object_r:spunvm_file:s0 wait
+/dev/block/bootdevice/by-name/spunvm                    /mnt/vendor/spunvm     vfat    rw,noatime,shortname=lower,uid=1000,gid=1000,dmask=007,fmask=007,context=u:object_r:vendor_spunvm_file:s0 wait
 /dev/block/bootdevice/by-name/modem                     /vendor/firmware_mnt   vfat    ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
 /dev/block/bootdevice/by-name/dsp                       /vendor/dsp            ext4    ro,nosuid,nodev,barrier=1                            wait,slotselect
 /dev/block/bootdevice/by-name/bluetooth                 /vendor/bt_firmware    vfat    ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait,slotselect
diff --git a/omni_zenfone7.mk b/omni_zenfone7.mk
index aa92f48..afa42a3 100644
--- a/omni_zenfone7.mk
+++ b/omni_zenfone7.mk
@@ -56,9 +56,9 @@
     PRODUCT_NAME=WW_I002D \
     TARGET_DEVICE=ZS670KS
 
-VENDOR_RELEASE := 11/RKQ1.200710.002/30.41.69.112_20210916:user/release-keys
+VENDOR_RELEASE := 12/SKQ1.210821.001/31.0210.0210.250:user/release-keys
 BUILD_FINGERPRINT := asus/WW_I002D/ASUS_I002D:$(VENDOR_RELEASE)
 OMNI_BUILD_FINGERPRINT := asus/WW_I002D/ASUS_I002D:$(VENDOR_RELEASE)
 
 # Security patch level from stock
-PLATFORM_SECURITY_PATCH_OVERRIDE := 2021-08-05
+PLATFORM_SECURITY_PATCH_OVERRIDE := 2022-05-05
diff --git a/proprietary-files-product.txt b/proprietary-files-product.txt
index f6371ff..9317fd1 100644
--- a/proprietary-files-product.txt
+++ b/proprietary-files-product.txt
@@ -8,22 +8,24 @@
 
 # Camera
 system_ext/lib64/libQSEEComAPI_system.so
-system_ext/lib64/vendor.qti.hardware.scve.objecttracker@1.0-adapter-helper.so
-system_ext/lib64/vendor.qti.hardware.scve.objecttracker@1.0.so
-system_ext/lib64/vendor.qti.hardware.scve.panorama@1.0-adapter-helper.so
-system_ext/lib64/vendor.qti.hardware.scve.panorama@1.0.so
+
+# Perf
+system_ext/bin/perfservice
+system_ext/etc/init/perfservice.rc
+system_ext/etc/perf/wlc_model.tflite
+system_ext/etc/seccomp_policy/perfservice.policy
 
 # QTI Telephony
 -system_ext/app/datastatusnotification/datastatusnotification.apk
 -system_ext/app/DynamicDDSService/DynamicDDSService.apk
--system_ext/app/uimgbaservice/uimgbaservice.apk
+-product/app/uimgbaservice/uimgbaservice.apk
 system_ext/etc/permissions/embms.xml
 system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml
-system_ext/etc/permissions/UimGba.xml
-system_ext/etc/permissions/UimGbaManager.xml
--system_ext/framework/embmslibrary.jar
--system_ext/framework/uimgbalibrary.jar
--system_ext/framework/uimgbamanagerlibrary.jar
+product/etc/permissions/UimGba.xml
+product/etc/permissions/UimGbaManager.xml
+-product/framework/uimgbalibrary.jar
+-product/framework/uimgbamanagerlibrary.jar
+
 # ROG 5
 -system_ext/framework/qti-telephony-common.jar|07B2B91F5D547C5B5E0752F0F5534321BC93A2C1
 product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml:system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml
@@ -71,7 +73,7 @@
 -system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar
 -system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar
 -system_ext/framework/com.qualcomm.qti.uceservice-V2.2-java.jar
--system_ext/framework/uimservicelibrary.jar
+-product/framework/uimservicelibrary.jar
 -system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar
 -system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar
 -system_ext/framework/vendor.qti.ims.factory-V1.0-java.jar
@@ -80,7 +82,7 @@
 -system_ext/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar
 -system_ext/framework/vendor.qti.ims.rcsconfig-V2.0-java.jar
 -system_ext/framework/vendor.qti.ims.rcsconfig-V2.1-java.jar
-system_ext/etc/permissions/UimService.xml
+product/etc/permissions/UimService.xml
 system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml
 system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml
 system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml
@@ -98,7 +100,6 @@
 system_ext/lib64/lib-imsvt.so
 system_ext/lib64/lib-imsvtutils.so
 system_ext/lib64/libseccam.so
-system_ext/lib64/vendor.qti.diaghal@1.0.so
 system_ext/lib64/vendor.qti.hardware.radio.am@1.0.so
 system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so
 system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so
@@ -125,6 +126,33 @@
 
 system_ext/lib64/vendor.qti.hardware.qteeconnector@1.0.so
 
+# Public Qti files
+system_ext/bin/qspmsvc
+system_ext/etc/init/qspmsvc.rc
+system_ext/lib64/vendor.qti.qspmhal@1.0.so
+system_ext/lib64/libdiag_system.qti.so
+system_ext/lib64/liblistenjni.qti.so
+system_ext/lib64/liblistensoundmodel2.qti.so
+system_ext/lib64/libqape.qti.so
+system_ext/lib64/libqesdk_ndk_platform.qti.so
+system_ext/lib64/libQOC.qti.so
+system_ext/lib64/libthermalclient.qti.so
+system_ext/lib64/libupdateprof.qti.so
+system_ext/lib64/vendor.qti.diaghal@1.0.so
+system_ext/lib64/vendor.qti.qesdhal@1.0.so
+system_ext/lib64/vendor.qti.qesdhal@1.1.so
+
+# Qccsys halservice
+system_ext/bin/qccsyshal@1.1-service
+system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.1-service.rc
+system_ext/lib64/libqcc_file_agent_sys.so
+system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so
+system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0-halimpl.so
+system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so
+system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1-halimpl.so
+system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.0-impl.so
+system_ext/lib64/hw/vendor.qti.hardware.qccsyshal@1.1-impl.so
+
 # Secure
 -system_ext/app/com.qualcomm.qti.services.secureui/com.qualcomm.qti.services.secureui.apk
 system_ext/lib64/libsecureuisvc_jni.so
@@ -132,8 +160,12 @@
 system_ext/lib64/vendor.qti.hardware.tui_comm@1.0.so
 system_ext/lib64/libcryptfs_hw.so
 
+# Symlink Qti library
+system_ext/etc/permissions/qti_supplicant_interface.xml
+
 # System Helper
 -system_ext/app/com.qualcomm.qti.services.systemhelper/com.qualcomm.qti.services.systemhelper.apk
 system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so
 system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so
+system_ext/lib64/vendor.qti.hardware.trustedui@1.0.so
 system_ext/lib64/libsystemhelper_jni.so
diff --git a/proprietary-files.txt b/proprietary-files.txt
index bb3202b..739db2a 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -10,7 +10,10 @@
 system_ext/lib64/libsdsprpc_system.so
 
 # Bluetooth
--app/aptxals/aptxals.apk
+-system_ext/app/aptxacu/aptxacu.apk
+-system_ext/app/aptxui/aptxui.apk
+-system_ext/priv-app/aptxals/aptxals.apk
+system_ext/etc/permissions/privapp-permissions-aptxals.xml
 system_ext/etc/permissions/audiosphere.xml
 -system_ext/framework/audiosphere.jar
 
@@ -25,23 +28,126 @@
 lib64/libxditk_ditArchLIB.so
 lib64/libxditk_ditBSP.so
 lib64/libxditk_ditBSP_JNI.so
--priv-app/AsusCamera/AsusCamera.apk
-priv-app/AsusCamera/lib/arm64/libasus_camera_panorama.so
-priv-app/AsusCamera/lib/arm64/libyuv_camera.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_interval_capture.so
-priv-app/AsusCamera/lib/arm64/libbitmap.so
-priv-app/AsusCamera/lib/arm64/libmpbase.so
-priv-app/AsusCamera/lib/arm64/libtensorflowlite_jni.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_selfiepano.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_object_tracking.so
-priv-app/AsusCamera/lib/arm64/libasus_camera_interval_panorama.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_panorama_burstcapture.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_portrait_distortion_correction_zf7.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_portrait_distortion_correction_rog3.so
-priv-app/AsusCamera/lib/arm64/libyuv_util.so
-priv-app/AsusCamera/lib/arm64/libUndistort.so
-priv-app/AsusCamera/lib/arm64/libasusundistort.so
-priv-app/AsusCamera/lib/arm64/libarcsoft_object_tracking.so
+-priv-app/AsusCameraApp/AsusCameraApp.apk
+priv-app/AsusCameraApp/lib/arm64/libarcsoft_object_tracking.so
+priv-app/AsusCameraApp/lib/arm64/libarcsoft_panorama_burstcapture.so
+priv-app/AsusCameraApp/lib/arm64/libarcsoft_panorama_interval_capture.so
+priv-app/AsusCameraApp/lib/arm64/libarcsoft_portrait_distortion_correction_rog3.so
+priv-app/AsusCameraApp/lib/arm64/libarcsoft_portrait_distortion_correction_zf7.so
+priv-app/AsusCameraApp/lib/arm64/libasusundistort.so
+priv-app/AsusCameraApp/lib/arm64/libasus_camera_interval_panorama.so
+priv-app/AsusCameraApp/lib/arm64/libasus_camera_object_tracking.so
+priv-app/AsusCameraApp/lib/arm64/libasus_camera_panorama.so
+priv-app/AsusCameraApp/lib/arm64/libasus_camera_selfiepano.so
+priv-app/AsusCameraApp/lib/arm64/libbitmap.so
+priv-app/AsusCameraApp/lib/arm64/libmpbase.so
+priv-app/AsusCameraApp/lib/arm64/libtensorflowlite_jni.so
+priv-app/AsusCameraApp/lib/arm64/libUndistort.so
+priv-app/AsusCameraApp/lib/arm64/libyuv_camera.so
+priv-app/AsusCameraApp/lib/arm64/libyuv_util.so
+
+system_ext/etc/hdr_config/ans_off/ans_config.txt
+system_ext/etc/hdr_config/ans_on/ans_config.txt
+system_ext/etc/hdr_config/main_inv_ls/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/main_inv_ls/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/main_inv_ls/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/main_inv_ls/RPP_HDR.txt
+system_ext/etc/hdr_config/main_inv_ls/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/main_inv_ls/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/main_inv_ls/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/main_inv_ls/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/main_inv_pt/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/main_inv_pt/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/main_inv_pt/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/main_inv_pt/RPP_HDR.txt
+system_ext/etc/hdr_config/main_inv_pt/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/main_inv_pt/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/main_inv_pt/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/main_inv_pt/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/main_ls/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/main_ls/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/main_ls/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/main_ls/RPP_HDR.txt
+system_ext/etc/hdr_config/main_ls/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/main_ls/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/main_ls/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/main_ls/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/main_pt/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/main_pt/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/main_pt/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/main_pt/RPP_HDR.txt
+system_ext/etc/hdr_config/main_pt/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/main_pt/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/main_pt/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/main_pt/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/none_inv_ls/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/none_inv_ls/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/none_inv_ls/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/none_inv_ls/RPP_HDR.txt
+system_ext/etc/hdr_config/none_inv_ls/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/none_inv_ls/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/none_inv_ls/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/none_inv_ls/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/none_inv_pt/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/none_inv_pt/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/none_inv_pt/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/none_inv_pt/RPP_HDR.txt
+system_ext/etc/hdr_config/none_inv_pt/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/none_inv_pt/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/none_inv_pt/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/none_inv_pt/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/none_ls/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/none_ls/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/none_ls/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/none_ls/RPP_HDR.txt
+system_ext/etc/hdr_config/none_ls/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/none_ls/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/none_ls/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/none_ls/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/none_pt/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/none_pt/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/none_pt/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/none_pt/RPP_HDR.txt
+system_ext/etc/hdr_config/none_pt/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/none_pt/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/none_pt/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/none_pt/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/selfie_inv_ls/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/selfie_inv_ls/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/selfie_inv_ls/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/selfie_inv_ls/RPP_HDR.txt
+system_ext/etc/hdr_config/selfie_inv_ls/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/selfie_inv_ls/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/selfie_inv_ls/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/selfie_inv_ls/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/selfie_inv_pt/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/selfie_inv_pt/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/selfie_inv_pt/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/selfie_inv_pt/RPP_HDR.txt
+system_ext/etc/hdr_config/selfie_inv_pt/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/selfie_inv_pt/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/selfie_inv_pt/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/selfie_inv_pt/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/selfie_ls/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/selfie_ls/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/selfie_ls/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/selfie_ls/RPP_HDR.txt
+system_ext/etc/hdr_config/selfie_ls/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/selfie_ls/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/selfie_ls/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/selfie_ls/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/selfie_pt/RPP_BiquadHPF_config.txt
+system_ext/etc/hdr_config/selfie_pt/RPP_EQLeftTop_config.txt
+system_ext/etc/hdr_config/selfie_pt/RPP_EQRightBottom_config.txt
+system_ext/etc/hdr_config/selfie_pt/RPP_HDR.txt
+system_ext/etc/hdr_config/selfie_pt/RPP_InputAGC_config.txt
+system_ext/etc/hdr_config/selfie_pt/RPP_InputCompressor_config.txt
+system_ext/etc/hdr_config/selfie_pt/RPP_Limiter_config.txt
+system_ext/etc/hdr_config/selfie_pt/RPP_OutputCompressor_config.txt
+system_ext/etc/hdr_config/wnr_off/wnr_config.txt
+system_ext/etc/hdr_config/wnr_off/wnr_params.txt
+system_ext/etc/hdr_config/wnr_on/wnr_config.txt
+system_ext/etc/hdr_config/wnr_on/wnr_params.txt
 
 # CNE
 -system_ext/framework/com.quicinc.cne.api-V1.0-java.jar
@@ -62,7 +168,7 @@
 
 # Device
 -system_ext/app/DeviceInfo/DeviceInfo.apk
--system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk
+-product/app/DeviceStatisticsService/DeviceStatisticsService.apk
 
 # Display
 -priv-app/AsusVisualMaster/AsusVisualMaster.apk
@@ -81,11 +187,13 @@
 system_ext/etc/permissions/dpmapi.xml
 -system_ext/framework/com.qti.dpmframework.jar
 -system_ext/framework/dpmapi.jar
+-system_ext/framework/vendor.qti.hardware.dpmservice-V1.0-java.jar
 system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so
 system_ext/lib64/libdpmctmgr.so
 system_ext/lib64/libdpmfdmgr.so
 system_ext/lib64/libdpmframework.so
 system_ext/lib64/libdpmtcm.so
+system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so
 -system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
 
 # Gallery
@@ -193,13 +301,7 @@
 -system_ext/framework/com.qti.location.sdk.jar
 -system_ext/framework/izat.xt.srv.jar
 -system_ext/priv-app/com.qualcomm.location/com.qualcomm.location.apk
-system_ext/lib64/vendor.qti.gnss@1.0.so
-system_ext/lib64/vendor.qti.gnss@1.1.so
-system_ext/lib64/vendor.qti.gnss@1.2.so
-system_ext/lib64/vendor.qti.gnss@2.0.so
-system_ext/lib64/vendor.qti.gnss@2.1.so
-system_ext/lib64/vendor.qti.gnss@3.0.so
-system_ext/lib64/vendor.qti.gnss@4.0.so
+system_ext/lib64/liblocsdk_diag_jni.so
 
 # HotwordEnrollment
 -product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk;PRESIGNED
@@ -229,40 +331,6 @@
 -framework/QPerformance.jar
 -framework/UxPerformance.jar
 
-# QVR
-system_ext/bin/qvrservice
-system_ext/etc/init/qvrd_ext.rc
-system_ext/etc/seccomp_policy/qvr@2.0.policy
-system_ext/etc/qvr/qvr_hid_device_list.txt
-system_ext/etc/qvr/qvrservice_config.txt
-system_ext/etc/qvr/cfg/339/0/65536/mtp855.txt
-system_ext/etc/qvr/cfg/339/0/65536/mtp855_6dof_config.xml
-system_ext/etc/qvr/cfg/341/2/65536/svr845.txt
-system_ext/etc/qvr/cfg/356/0/65536/mtp865.txt
-system_ext/etc/qvr/cfg/356/0/65536/mtp865_6dof_config.xml
-system_ext/etc/qvr/cfg/356/1/131072/morpheus.txt
-system_ext/etc/qvr/cfg/356/1/131072/morpheus_6dof_config.xml
-system_ext/etc/qvr/cfg/356/1/65536/trinity.txt
-system_ext/etc/qvr/cfg/356/1/65536/trinity_6dof_config.xml
-system_ext/etc/qvr/cfg/415/0/65536/mtplahaina.txt
-system_ext/etc/qvr/cfg/415/0/65536/mtplahaina_6dof_config.xml
-system_ext/lib/libqvrcamera_client.qti.so
-system_ext/lib/libqvrservice.so
-system_ext/lib/libScenescape.so
-system_ext/lib/rfsa/adsp/libdsp_streamer_qvrcam_receiver.so
-system_ext/lib/rfsa/adsp/libeye_tracking_dsp_sample_skel.so
-system_ext/lib/rfsa/adsp/libqvr_cam_dsp_driver_skel.so
-system_ext/lib/rfsa/adsp/libtracker_6dof_skel_8150.so
-system_ext/lib/rfsa/adsp/libtracker_6dof_skel_8250.so
-system_ext/lib/libqvr_cam_cdsp_driver_stub.so
-system_ext/lib/libqvr_eyetracking_plugin.so
-system_ext/lib/libqvr_cdsp_driver_stub.so
-system_ext/lib64/libqvrcamera_client.qti.so
-system_ext/lib64/libqvrservice_client.qti.so
-system_ext/lib64/libqvrservice_ov7251_hvx_tuning.so
-system_ext/lib64/libqvrservice_ov9282_hvx_tuning.so
-system_ext/lib64/libqvrservice_v4l_ov7251_hvx_tuning.so
-
 # Telephony
 product/etc/permissions/telephony_product_privapp-permissions-qti.xml
 system_ext/etc/permissions/qti_libpermissions.xml
@@ -270,7 +338,6 @@
 system_ext/etc/sysconfig/qti_whitelist_system_ext.xml
 system_ext/etc/permissions/qcrilhook.xml
 system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml
-system_ext/etc/permissions/telephonyservice.xml
 -system_ext/framework/qcrilhook.jar
 -system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
 -system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
@@ -278,17 +345,18 @@
 # Wfd
 -framework/WfdCommon.jar
 system_ext/bin/wfdservice
+system_ext/bin/wfdservice64
 system_ext/etc/init/wfdservice.rc
 system_ext/etc/wfdconfigsink.xml
 system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml
 system_ext/etc/seccomp_policy/wfdservice.policy
+system_ext/etc/seccomp_policy/wfdservice64.policy
 -system_ext/priv-app/WfdService/WfdService.apk
 system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so
 system_ext/lib/libmmosal.so
 system_ext/lib/libmmparser_lite.so
 system_ext/lib/libmmrtpdecoder.so
 system_ext/lib/libmmrtpencoder.so
-system_ext/lib/libwfdaac.so
 system_ext/lib/libwfdavenhancements.so
 system_ext/lib/libwfdclient.so
 system_ext/lib/libwfdcommonutils.so
@@ -326,6 +394,11 @@
 system_ext/lib64/libwfduibcsrcinterface.so
 system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
 
+# Wifi
+-framework/android.hardware.wifi.supplicant-V1.0-java.jar
+-framework/android.hardware.wifi.supplicant-V1.1-java.jar
+-framework/android.hardware.wifi.supplicant-V1.2-java.jar
+-framework/android.hardware.wifi.supplicant-V1.3-java.jar
 # Wlan
 -system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar
 system_ext/lib64/vendor.qti.hardware.data.iwlan@1.0.so
\ No newline at end of file
diff --git a/system.prop b/system.prop
index 0ffa1e5..030d69e 100644
--- a/system.prop
+++ b/system.prop
@@ -1,3 +1,163 @@
+ro.vendor.smartcharging=1
+ro.vendor.disableaicharging=1
+
+####################################
+#
+# system.prop for qssi
+#
+rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so
+#rild.libargs=-d /dev/smd0
+persist.rild.nitz_plmn=
+persist.rild.nitz_long_ons_0=
+persist.rild.nitz_long_ons_1=
+persist.rild.nitz_long_ons_2=
+persist.rild.nitz_long_ons_3=
+persist.rild.nitz_short_ons_0=
+persist.rild.nitz_short_ons_1=
+persist.rild.nitz_short_ons_2=
+persist.rild.nitz_short_ons_3=
+ril.subscription.types=RUIM,RUIM
+DEVICE_PROVISIONED=1
+# Set network mode to (NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA, NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA) for 8+8 mode device on DSDS mode
+#ro.telephony.default_network=33,33
+dalvik.vm.heapsize=36m
+dalvik.vm.dex2oat64.enabled=true
+dev.pm.dyn_samplingrate=1
+#ro.hdmi.enable=true
+#persist.speaker.prot.enable=false
+qcom.hw.aac.encoder=true
+#
+# system props for the cne module
+#
+persist.vendor.cne.feature=1
+#system props for the MM modules
+media.stagefright.enable-player=true
+media.stagefright.enable-http=true
+media.stagefright.enable-aac=true
+media.stagefright.enable-qcp=true
+media.stagefright.enable-fma2dp=true
+media.stagefright.enable-scan=true
+media.stagefright.thumbnail.prefer_hw_codecs=true
+mmp.enable.3g2=true
+media.aac_51_output_enabled=true
+media.settings.xml=/vendor/etc/media_profiles_vendor.xml
+#16777215 is decimal sum of supported codecs in AAL
+#codecs:(PARSER_)AAC AC3 AMR_NB AMR_WB ASF AVI DTS FLV 3GP 3G2 MKV MP2PS MP2TS MP3 OGG QCP WAV FLAC AIFF APE DSD MOV MHAS
+#FIH disable MHAS for CTS test
+#vendor.mm.enable.qcom_parser=12582655
+vendor.mm.enable.qcom_parser=4194047
+persist.mm.enable.prefetch=true
+#Netflix custom property
+ro.netflix.bsp_rev=Q8250-19134-1
+ro.audio.monitorRotation=true
+#
+# system props for the data modules
+#
+ro.vendor.use_data_netmgrd=true
+persist.vendor.data.mode=concurrent
+#system props for time-services
+persist.timed.enable=true
+#
+# system prop for opengles version
+#
+# 196608 is decimal for 0x30000 to report version 3
+# 196609 is decimal for 0x30001 to report version 3.1
+# 196610 is decimal for 0x30002 to report version 3.2
+ro.opengles.version=196610
+#
+# System props for telephony
+# System prop to turn on CdmaLTEPhone always
+telephony.lteOnCdmaDevice=1
+#Simulate sdcard on /data/media
+#
+persist.fuse_sdcard=true
+#System props for BT
+#ro.bluetooth.library_name=libbluetooth_qti.so
+persist.vendor.btstack.aac_frm_ctl.enabled=true
+#[SWAS6]_BT_Porting_start
+persist.vendor.service.bt.iotinfo.report.enable=true
+persist.vendor.btstack.enable.twsplus=true
+persist.vendor.btstack.enable.twsplussho=true
+persist.bluetooth.avrcpversion=avrcp16
+# ASUS BSP Bluetooth: disable SWB
+persist.vendor.qcom.bluetooth.enable.swb=false
+persist.vendor.qcom.bluetooth.enable.swbpm=false
+#[SWAS6]_BT_Porting_end
+#system prop for RmNet Data
+persist.rmnet.data.enable=true
+persist.data.wda.enable=true
+persist.data.df.dl_mode=5
+persist.data.df.ul_mode=5
+persist.data.df.agg.dl_pkt=10
+persist.data.df.agg.dl_size=4096
+persist.data.df.mux_count=8
+persist.data.df.iwlan_mux=9
+persist.data.df.dev_name=rmnet_usb0
+#property to enable user to access Google WFD settings
+persist.debug.wfd.enable=1
+##property to choose between virtual/external wfd display
+persist.sys.wfd.virtual=0
+#property to enable HWC for VDS
+debug.sf.enable_hwc_vds=1
+#property to latch unsignaled buffer
+debug.sf.latch_unsignaled=1
+# enable tunnel encoding for amrwb
+tunnel.audio.encode=true
+#enable voice path for PCM VoIP by default
+use.voice.path.for.pcm.voip=true
+# system prop for NFC DT
+ro.nfc.port=I2C
+#initialize QCA1530 detection
+sys.qca1530=detect
+#Enable stm events
+persist.debug.coresight.config=stm-events
+#Bringup properties
+persist.sys.force_sw_gles=1
+persist.vendor.radio.atfwd.start=true
+ro.kernel.qemu.gles=0
+qemu.hw.mainkeys=0
+#Expose aux camera for below packages
+#vendor.camera.aux.packagelist=org.codeaurora.snapcam
+#Add snapcam in privapp list
+#persist.vendor.camera.privapp.list=org.codeaurora.snapcam
+#enable IZat OptInApp overlay
+persist.vendor.overlay.izat.optin=rro
+# Property for backup NTP Server
+persist.backup.ntpServer="0.pool.ntp.org"
+#Property to enable Mag filter
+persist.vendor.sensors.enable.mag_filter=true
+#Partition source order for Product/Build properties pickup.
+#ro.product.property_source_order=odm,vendor,product,system_ext,system
+#Property to enable Codec2 for audio and OMX for Video
+debug.stagefright.ccodec=1
+#Property to set native recorder's maximum base layer fps
+ro.media.recorder-max-base-layer-fps=60
+#Property to enable logcat service
+ro.logd.kernel=1
+#persist.vendor.asus.logcat.filenum=20
+persist.logd.size=1048576
+#ro.vendor.asus.logcat=1
+# Property for default log flag
+#persist.vendor.asus.startlog=0
+persist.vendor.sys.downloadmode.enable=0
+# [ASUS BSP] for Poweroff Alarm Support
+# remove this becuase ASUS inform design change to PM feature: asus.software.poweroffalarm_support
+# ro.vendor.asus.poweroffalarm_support=1
+#Battery Property
+ro.charger.enable_suspend=1
+#Disable MTE Async for system server
+arm64.memtag.process.system_server=off
+ro.soc.manufacturer=QTI
+ro.soc.model=SM8250
+####################################
+# from vendor/ims/data/twinapps/twinapps.prop
+####################################
+#
+# system.prop for TwinApps
+#
+#ASUS IMS Carol_Hu: https://android-review.googlesource.com/c/platform/build/+/1417451
+external_storage.cross_user.enabled=1
+
 vendor.camera.cam10.crop_region=2:0,0,4032,3024;6:728,546,3304,2478;3:1584,1189,2448,1836
 vendor.camera.cam11.crop_region=4:0,0,4032,3024;7:728,546,3304,2478;5:1584,1189,2448,1836
 vendor.camera.ai_scene_mode=2:1;3:1;4:1;5:1;6:1;7:1;8:0;9:0;10:1;11:1
@@ -41,3 +201,10 @@
 vendor.camera.expTimeMax=0
 vendor.camera.night=6:1;7:1;2:1;4:1;3:0;5:0;10:1;11:1
 vendor.camera.atdtest=6:11;2:0;3:0
+ro.vendor.qti.va_aosp.support=1
+####################################
+# from variable PRODUCT_SYSTEM_DEFAULT_PROPERTIES
+####################################
+ro.config.vc_call_vol_default=3
+ro.config.media_vol_default=15
+ro.config.media_vol_steps=30
diff --git a/vendor_framework_compatibility_matrix.xml b/vendor_framework_compatibility_matrix.xml
index 5de4e7f..33cdcbd 100644
--- a/vendor_framework_compatibility_matrix.xml
+++ b/vendor_framework_compatibility_matrix.xml
@@ -8,8 +8,6 @@
         <version>1.1</version>
         <interface>
             <name>IEvsEnumerator</name>
-            <instance>EvsEnumeratorHw</instance>
-            <instance>EvsEnumeratorHw-Mock</instance>
             <instance>default</instance>
         </interface>
     </hal>
@@ -100,6 +98,7 @@
         <name>com.qualcomm.qti.uceservice</name>
         <version>2.0-1</version>
         <version>2.2</version>
+        <version>2.3</version>
         <interface>
             <name>IUceService</name>
             <instance>com.qualcomm.qti.uceservice</instance>
@@ -142,6 +141,14 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.asus.wifi.hostapd</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAsusHostapd</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.asus.wifi.netutil</name>
         <version>1.0</version>
         <interface>
@@ -151,7 +158,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.display.color</name>
-        <version>1.0-5</version>
+        <version>1.0-7</version>
         <interface>
             <name>IDisplayColor</name>
             <instance>default</instance>
@@ -198,12 +205,11 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.nxp.hardware.nfc</name>
-        <version>1.0-1</version>
+    <hal format="hidl" optional="false">
+        <name>vendor.nxp.nxpnfc</name>
         <version>2.0</version>
         <interface>
-            <name>INqNfc</name>
+            <name>INxpNfc</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -224,6 +230,14 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.pixelworks.hardware.display</name>
+        <version>1.0</version>
+        <interface>
+            <name>IIris</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.automotive.qcarcam</name>
         <version>1.0</version>
         <interface>
@@ -234,7 +248,7 @@
     <hal format="hidl" optional="true">
         <name>vendor.qti.data.factory</name>
         <version>1.0</version>
-        <version>2.0-1</version>
+        <version>2.0-4</version>
         <interface>
             <name>IFactory</name>
             <instance>default</instance>
@@ -261,12 +275,35 @@
         <version>1.0-2</version>
         <version>2.0-1</version>
         <version>3.0</version>
-        <version>4.0</version>
+        <version>4.0-1</version>
         <interface>
             <name>ILocHidlGnss</name>
             <instance>gnss_vendor</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.gnss</name>
+        <interface>
+            <name>ILocAidlGnss</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.AGMIPC</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAGM</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.ListenSoundModel</name>
+        <version>1.0</version>
+        <interface>
+            <name>IListenSoundModel</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.alarm</name>
         <version>1.0</version>
@@ -285,7 +322,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.bluetooth_audio</name>
-        <version>2.0</version>
+        <version>2.0-1</version>
         <interface>
             <name>IBluetoothAudioProvidersFactory</name>
             <instance>default</instance>
@@ -317,6 +354,14 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.camera.aon</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAONService</name>
+            <instance>aoncameraservice</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.camera.postproc</name>
         <version>1.0</version>
         <interface>
@@ -359,7 +404,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.data.iwlan</name>
-        <version>1.0</version>
+        <version>1.0-1</version>
         <interface>
             <name>IIWlan</name>
             <instance>slot1</instance>
@@ -396,11 +441,28 @@
         <name>vendor.qti.hardware.display.composer</name>
         <version>2.0-1</version>
         <version>3.0</version>
+        <version>3.1</version>
         <interface>
             <name>IQtiComposer</name>
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.display.config</name>
+        <interface>
+            <name>IDisplayConfig</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.display.demura</name>
+        <version>1.0</version>
+        <version>2.0</version>
+        <interface>
+            <name>IDemuraFileFinder</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.display.mapper</name>
         <version>2.0</version>
@@ -412,6 +474,14 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.dpmservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>IDpmService</name>
+            <instance>DpmService</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.dsp</name>
         <version>1.0</version>
         <interface>
@@ -429,7 +499,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.embmssl</name>
-        <version>1.0</version>
+        <version>1.0-1</version>
         <interface>
             <name>IEmbms</name>
             <instance>embmsslServer0</instance>
@@ -492,17 +562,49 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.limits</name>
+        <version>1.0-1</version>
+        <interface>
+            <name>ILimits</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.mwqemadapter</name>
+        <version>1.0</version>
+        <interface>
+            <name>IMwqemAdapter</name>
+            <instance>MwqemAdapter</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.pal</name>
+        <version>1.0</version>
+        <interface>
+            <name>IPAL</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.perf</name>
-        <version>2.0</version>
+        <version>2.0-3</version>
         <interface>
             <name>IPerf</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.qccsyshal</name>
+        <name>vendor.qti.hardware.power.powermodule</name>
         <version>1.0</version>
         <interface>
+            <name>IPowerModule</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.qccsyshal</name>
+        <version>1.0-1</version>
+        <interface>
             <name>IQccsyshal</name>
             <instance>qccsyshal</instance>
         </interface>
@@ -516,6 +618,14 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.qconfig</name>
+        <version>1.0</version>
+        <interface>
+            <name>IQConfig</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.qdutils_disp</name>
         <version>1.0</version>
         <interface>
@@ -543,6 +653,41 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRCoreService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRCamService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRSplitService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRModService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRAudioService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.am</name>
         <version>1.0</version>
@@ -552,9 +697,25 @@
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.am</name>
+        <interface>
+            <name>IQcRilAudio</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.ims</name>
-        <version>1.0-6</version>
+        <version>1.0-8</version>
+        <interface>
+            <name>IImsRadio</name>
+            <instance>imsradio0</instance>
+            <instance>imsradio1</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.ims</name>
         <interface>
             <name>IImsRadio</name>
             <instance>imsradio0</instance>
@@ -571,7 +732,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.lpa</name>
-        <version>1.0</version>
+        <version>1.0-1</version>
         <interface>
             <name>IUimLpa</name>
             <instance>UimLpa0</instance>
@@ -590,13 +751,21 @@
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.qtiradio</name>
         <version>1.0</version>
-        <version>2.0-4</version>
+        <version>2.0-6</version>
         <interface>
             <name>IQtiRadio</name>
             <instance>slot1</instance>
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.qtiradio</name>
+        <interface>
+            <name>IQtiRadioStable</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.uim</name>
         <version>1.1-2</version>
@@ -693,6 +862,14 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.sxrhal</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISxrCrypto</name>
+            <instance>sxrhalservice</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.systemhelper</name>
         <version>1.0</version>
         <interface>
@@ -706,7 +883,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.trustedui</name>
-        <version>1.0</version>
+        <version>1.0-2</version>
         <interface>
             <name>ITrustedInput</name>
             <instance>default</instance>
@@ -737,7 +914,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wifi.hostapd</name>
-        <version>1.0-2</version>
+        <version>1.0-3</version>
         <interface>
             <name>IHostapdVendor</name>
             <instance>default</instance>
@@ -746,13 +923,21 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wifi.supplicant</name>
-        <version>2.0</version>
+        <version>2.0-3</version>
         <interface>
             <name>ISupplicantVendor</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.wifi.wificfr</name>
+        <version>1.0</version>
+        <interface>
+            <name>IWificfr</name>
+            <instance>wificfr</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wifi.wifilearner</name>
         <version>1.0</version>
         <interface>
@@ -761,6 +946,14 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.wifi.wifimyftm</name>
+        <version>1.0</version>
+        <interface>
+            <name>IWifiMyFtm</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wifidisplaysession</name>
         <version>1.0</version>
         <interface>
@@ -815,6 +1008,7 @@
     <hal format="hidl" optional="true">
         <name>vendor.qti.ims.factory</name>
         <version>1.0-1</version>
+        <version>2.0</version>
         <interface>
             <name>IImsFactory</name>
             <instance>default</instance>
@@ -830,13 +1024,29 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.memory.pasrmanager</name>
-        <version>1.0</version>
+        <version>1.0-1</version>
         <interface>
             <name>IPasrManager</name>
             <instance>pasrhal</instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.qti.mstatservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>IMStatService</name>
+            <instance>mstatservice</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.qesdhal</name>
+        <version>1.0-1</version>
+        <interface>
+            <name>IQesdhal</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.qspmhal</name>
         <version>1.0</version>
         <interface>
@@ -844,6 +1054,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.sla.service</name>
+        <version>1.0</version>
+        <interface>
+            <name>ISlaService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="false">
         <name>vendor.qti.sla.service</name>
         <version>1.0</version>
@@ -854,7 +1072,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.spu</name>
-        <version>1.0</version>
+        <version>1.0-1</version>
         <interface>
             <name>ISPUManager</name>
             <instance>default</instance>
@@ -868,15 +1086,4 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <sepolicy>
-        <kernel-sepolicy-version>30</kernel-sepolicy-version>
-        <sepolicy-version>26.0</sepolicy-version>
-        <sepolicy-version>27.0</sepolicy-version>
-        <sepolicy-version>28.0</sepolicy-version>
-        <sepolicy-version>29.0</sepolicy-version>
-        <sepolicy-version>30.0</sepolicy-version>
-    </sepolicy>
-    <avb>
-        <vbmeta-version>1.0</vbmeta-version>
-    </avb>
 </compatibility-matrix>