zenfone9: Update from A14 34.0304.2004.87 source

Change-Id: I6b6d3016dc95c57241618fc842329b942ad932b5
diff --git a/BoardConfig.mk b/BoardConfig.mk
index db7c369..6c87a7c 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -232,7 +232,7 @@
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
 
 # Security patch level
-BOOT_SECURITY_PATCH := 2023-06-05
+BOOT_SECURITY_PATCH := 2024-02-05
 VENDOR_SECURITY_PATCH := $(BOOT_SECURITY_PATCH)
 
 # Sepolicy
diff --git a/manifest/manifest_cape.xml b/manifest/manifest_cape.xml
index 9793103..b4efc22 100644
--- a/manifest/manifest_cape.xml
+++ b/manifest/manifest_cape.xml
@@ -211,16 +211,6 @@
         <fqname>@2.0::INxpNfc/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>vendor.nxp.nxpnfclegacy</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>INxpNfcLegacy</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::INxpNfcLegacy/default</fqname>
-    </hal>
-    <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>
         <version>2.5</version>
@@ -676,16 +666,6 @@
         <fqname>@3.0::IRTPService/imsrtpservice</fqname>
     </hal>
     <hal format="hidl">
-        <name>vendor.qti.qesdhal</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IQesdhal</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.1::IQesdhal/default</fqname>
-    </hal>
-    <hal format="hidl">
         <name>vendor.qti.qspmhal</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
diff --git a/manifest/vendor_framework_compatibility_matrix.xml b/manifest/vendor_framework_compatibility_matrix.xml
index 15bab50..6ffdcb9 100644
--- a/manifest/vendor_framework_compatibility_matrix.xml
+++ b/manifest/vendor_framework_compatibility_matrix.xml
@@ -24,7 +24,14 @@
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<compatibility-matrix version="5.0" type="framework">
+<compatibility-matrix version="7.0" type="framework">
+    <hal format="aidl" optional="true">
+        <name>android.hardware.authsecret.qti.spu</name>
+        <interface>
+            <name>IAuthSecret</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.automotive.evs</name>
         <version>1.1</version>
@@ -43,6 +50,13 @@
             <instance>gnss_vendor</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>android.hardware.graphics.allocator</name>
+        <interface>
+            <name>IAllocator</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.media.c2</name>
         <version>1.0</version>
@@ -61,6 +75,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>android.hardware.nfc</name>
+        <interface>
+            <name>INfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.radio</name>
         <version>1.0-4</version>
@@ -84,35 +105,33 @@
         </interface>
     </hal>
     <hal format="aidl" optional="true">
-        <name>android.hardware.power</name>
-        <version>1</version>
+        <name>android.hardware.tetheroffload</name>
         <interface>
-            <name>IPower</name>
+            <name>IOffload</name>
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>android.hardware.wifi.hostapd</name>
-        <version>1</version>
-        <interface>
-            <name>IHostapd</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
+    <hal format="hidl" optional="true">
         <name>android.hardware.wifi.supplicant</name>
-        <version>1</version>
+        <version>1.0-2</version>
         <interface>
             <name>ISupplicant</name>
             <instance>default</instance>
             <instance>wigigp2p</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.wifi</name>
-        <version>1.0-6</version>
+    <hal format="aidl" optional="true">
+        <name>android.se.omapi</name>
         <interface>
-            <name>IWifi</name>
+            <name>ISecureElementService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>com.android.ozoaudio.notify</name>
+        <version>1.0</version>
+        <interface>
+            <name>IOzoNotify</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -167,6 +186,38 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.aks.gamepad</name>
+        <version>1.0</version>
+        <interface>
+            <name>IGamepad</name>
+            <instance>default</instance>
+        </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.1</version>
+        <interface>
+            <name>IWifiNetUtil</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.asus.wifi.rttutil</name>
+        <version>1.0</version>
+        <interface>
+            <name>IWifiRttUtil</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.display.color</name>
         <version>1.0-7</version>
         <interface>
@@ -192,6 +243,54 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.goodix.hardware.biometrics.fingerprint</name>
+        <version>2.1</version>
+        <interface>
+            <name>IGoodixFingerprintDaemon</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.ims.asusgeneralhidl</name>
+        <version>1.0</version>
+        <interface>
+            <name>IAsusGeneralHIDLE</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.ims.glovemode</name>
+        <version>1.0</version>
+        <interface>
+            <name>IGloveMode</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.ims.wifiantennamode</name>
+        <version>1.0</version>
+        <interface>
+            <name>IWifiantennamode</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.ims.zenmotion</name>
+        <version>1.0</version>
+        <interface>
+            <name>IZenMotion</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.nxp.eventprocessor</name>
+        <version>1.0</version>
+        <interface>
+            <name>INxpEseEvtProcessor</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.nxp.hardware.nfc</name>
         <version>1.0-1</version>
         <version>2.0</version>
@@ -201,6 +300,29 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.nxp.nxpese</name>
+        <version>1.0</version>
+        <interface>
+            <name>INxpEse</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.nxp.nxpnfc</name>
+        <version>2.0</version>
+        <interface>
+            <name>INxpNfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.nxp.nxpnfc_aidl</name>
+        <interface>
+            <name>INxpNfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.nxp.nxpnfclegacy</name>
         <version>1.0</version>
         <interface>
@@ -209,6 +331,29 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
+        <name>vendor.pixelworks.hardware.display</name>
+        <version>1.1</version>
+        <interface>
+            <name>IIris</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.pixelworks.hardware.feature</name>
+        <version>1.0</version>
+        <interface>
+            <name>IIrisFeature</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.ImsRtpService</name>
+        <interface>
+            <name>IRTPService</name>
+            <instance>ImsRtpService</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
         <name>vendor.qti.automotive.qcarcam</name>
         <version>1.0</version>
         <interface>
@@ -219,7 +364,14 @@
     <hal format="hidl" optional="true">
         <name>vendor.qti.data.factory</name>
         <version>1.0</version>
-        <version>2.0-7</version>
+        <version>2.0-8</version>
+        <interface>
+            <name>IFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.data.factoryservice</name>
         <interface>
             <name>IFactory</name>
             <instance>default</instance>
@@ -227,7 +379,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.qti.data.txpwrservice</name>
-        <version>1-2</version>
+        <version>1-6</version>
         <interface>
             <name>ITxPwrService</name>
             <instance>default</instance>
@@ -254,7 +406,7 @@
         <version>1.0-2</version>
         <version>2.0-1</version>
         <version>3.0</version>
-        <version>4.0-1</version>
+        <version>4.0-2</version>
         <interface>
             <name>ILocHidlGnss</name>
             <instance>gnss_vendor</instance>
@@ -262,6 +414,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.qti.gnss</name>
+        <version>1-5</version>
         <interface>
             <name>ILocAidlGnss</name>
             <instance>default</instance>
@@ -291,6 +444,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.alarm</name>
+        <interface>
+            <name>IAlarm</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.audiohalext</name>
         <version>1.0</version>
@@ -299,6 +459,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.bluetooth.xpanprovider</name>
+        <interface>
+            <name>IXpanProvider</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.bluetooth_audio</name>
         <version>2.0-1</version>
@@ -326,7 +493,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.qti.hardware.bttpi</name>
-        <version>1-2</version>
+        <version>1-3</version>
         <interface>
             <name>IBtTpi</name>
             <instance>default</instance>
@@ -340,14 +507,35 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.cacertaidlservice</name>
+        <interface>
+            <name>IService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.camera.aon</name>
-        <version>1.0-3</version>
+        <version>1.0-4</version>
         <interface>
             <name>IAONService</name>
             <instance>aoncameraservice</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.camera.aon</name>
+        <interface>
+            <name>IAONService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.camera.offlinecamera</name>
+        <interface>
+            <name>IOfflineCameraService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.camera.postproc</name>
         <version>1.0</version>
@@ -390,6 +578,14 @@
         </interface>
     </hal>
     <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.data.connectionaidl</name>
+        <interface>
+            <name>IDataConnection</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
         <name>vendor.qti.hardware.data.connectionfactory</name>
         <interface>
             <name>IFactory</name>
@@ -406,6 +602,14 @@
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.data.iwlandata</name>
+        <interface>
+            <name>IIWlan</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.data.latency</name>
         <version>1.0</version>
@@ -422,6 +626,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.debugutils</name>
+        <interface>
+            <name>IDebugUtils</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.display.allocator</name>
         <version>1.0</version>
@@ -432,19 +643,34 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.display.color</name>
+        <interface>
+            <name>IDisplayColor</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.display.composer</name>
         <version>2.0-1</version>
         <version>3.0</version>
         <version>3.1</version>
+        <version>3.2</version>
         <interface>
             <name>IQtiComposer</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.display.composer3</name>
+        <interface>
+            <name>IQtiComposer3Client</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
         <name>vendor.qti.hardware.display.config</name>
-        <version>1-5</version>
+        <version>1-11</version>
         <interface>
             <name>IDisplayConfig</name>
             <instance>default</instance>
@@ -459,6 +685,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.display.demura</name>
+        <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>
@@ -469,6 +702,20 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.display.postproc</name>
+        <interface>
+            <name>IDisplayPostproc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.dpmaidlservice</name>
+        <interface>
+            <name>IDpmService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.dpmservice</name>
         <version>1.0-1</version>
@@ -494,14 +741,6 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.embmssl</name>
-        <version>1.0-1</version>
-        <interface>
-            <name>IEmbms</name>
-            <instance>embmsslServer0</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.factory</name>
         <version>1.0-1</version>
         <interface>
@@ -509,11 +748,10 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.fingerprint</name>
-        <version>1.0</version>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.factory</name>
         <interface>
-            <name>IQtiExtendedFingerprint</name>
+            <name>IFactory</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -534,22 +772,6 @@
         </interface>
     </hal>
     <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.improvetouch.blobmanager</name>
-        <version>1.0</version>
-        <interface>
-            <name>IBlobManager</name>
-            <instance>BlobManagerService</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.improvetouch.gesturemanager</name>
-        <version>1.0</version>
-        <interface>
-            <name>IGestureManager</name>
-            <instance>GestureManagerService</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.improvetouch.touchcompanion</name>
         <version>1.0</version>
         <interface>
@@ -581,6 +803,13 @@
             <instance>MwqemAdapter</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.mwqemadapteraidlservice</name>
+        <interface>
+            <name>IMwqemAdapter</name>
+            <instance>MwqemAdapter</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.pal</name>
         <version>1.0</version>
@@ -597,6 +826,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.perf2</name>
+        <interface>
+            <name>IPerf</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.power.powermodule</name>
         <version>1.0</version>
@@ -605,12 +841,11 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.qccsyshal</name>
-        <version>1.0-1</version>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.power.powermodule</name>
         <interface>
-            <name>IQccsyshal</name>
-            <instance>qccsyshal</instance>
+            <name>IPowerModule</name>
+            <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">
@@ -629,6 +864,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qconfig</name>
+        <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>
@@ -645,6 +887,20 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qseecom</name>
+        <interface>
+            <name>IQSEECom</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qspa</name>
+        <interface>
+            <name>IQspa</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.qteeconnector</name>
         <version>1.0</version>
@@ -658,37 +914,41 @@
         </interface>
     </hal>
     <hal format="aidl" optional="true">
-        <name>vendor.qti.hardware.qxr</name>
+        <name>vendor.qti.hardware.qteeconnector</name>
         <interface>
-            <name>IQXRCoreService</name>
+            <name>IAppConnector</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IGPAppConnector</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.qti.hardware.qxr</name>
+        <version>1-2</version>
+        <interface>
+            <name>IQXRAudioService</name>
+            <instance>default</instance>
+        </interface>
         <interface>
             <name>IQXRCamService</name>
             <instance>default</instance>
         </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.qti.hardware.qxr</name>
         <interface>
-            <name>IQXRSplitService</name>
+            <name>IQXRCommService</name>
             <instance>default</instance>
         </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRCoreService</name>
+            <instance>default</instance>
+        </interface>
         <interface>
             <name>IQXRModService</name>
             <instance>default</instance>
         </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.qti.hardware.qxr</name>
         <interface>
-            <name>IQXRAudioService</name>
+            <name>IQXRSplitService</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -716,9 +976,16 @@
             <instance>AtCmdFwdAidl</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.atfwd</name>
+        <interface>
+            <name>IAtFwd</name>
+            <instance>AtFwdAidl</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.ims</name>
-        <version>1.0-8</version>
+        <version>1.0-9</version>
         <interface>
             <name>IImsRadio</name>
             <instance>imsradio0</instance>
@@ -727,7 +994,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.qti.hardware.radio.ims</name>
-        <version>1-7</version>
+        <version>1-12</version>
         <interface>
             <name>IImsRadio</name>
             <instance>imsradio0</instance>
@@ -758,6 +1025,14 @@
             <instance>UimLpa1</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.lpa</name>
+        <interface>
+            <name>IUimLpa</name>
+            <instance>UimLpa0</instance>
+            <instance>UimLpa1</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.qcrilhook</name>
         <version>1.0</version>
@@ -778,7 +1053,7 @@
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.qtiradio</name>
         <version>1.0</version>
-        <version>2.0-6</version>
+        <version>2.0-7</version>
         <interface>
             <name>IQtiRadio</name>
             <instance>slot1</instance>
@@ -787,7 +1062,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.qti.hardware.radio.qtiradio</name>
-        <version>1-8</version>
+        <version>1-11</version>
         <interface>
             <name>IQtiRadioStable</name>
             <instance>slot1</instance>
@@ -796,7 +1071,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.qti.hardware.radio.qtiradioconfig</name>
-        <version>1-2</version>
+        <version>1-4</version>
         <interface>
             <name>IQtiRadioConfig</name>
             <instance>default</instance>
@@ -811,6 +1086,14 @@
             <instance>Uim1</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.uim</name>
+        <interface>
+            <name>IUim</name>
+            <instance>Uim0</instance>
+            <instance>Uim1</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.uim_remote_client</name>
         <version>1.0</version>
@@ -820,6 +1103,14 @@
             <instance>uimRemoteClient1</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.uim_remote_client</name>
+        <interface>
+            <name>IUimRemoteServiceClient</name>
+            <instance>uimRemoteClient0</instance>
+            <instance>uimRemoteClient1</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.uim_remote_server</name>
         <version>1.0</version>
@@ -829,6 +1120,14 @@
             <instance>uimRemoteServer1</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.uim_remote_server</name>
+        <interface>
+            <name>IUimRemoteServiceServer</name>
+            <instance>uimRemoteServer0</instance>
+            <instance>uimRemoteServer1</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.scve.objecttracker</name>
         <version>1.0</version>
@@ -863,6 +1162,15 @@
         <interface>
             <name>ISecureProcessor</name>
             <instance>qti-tee</instance>
+            <instance>qti-tvm</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.secureprocessor.device</name>
+        <interface>
+            <name>ISecureProcessor</name>
+            <instance>qti-tee</instance>
+            <instance>qti-tvm</instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">
@@ -873,6 +1181,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.sensorscalibrate</name>
+        <interface>
+            <name>ISensorsCalibrate</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.servicetracker</name>
         <version>1.0-2</version>
@@ -881,6 +1196,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.servicetrackeraidl</name>
+        <interface>
+            <name>IServicetracker</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.slmadapter</name>
         <version>1.0</version>
@@ -897,6 +1219,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.soter</name>
+        <interface>
+            <name>ISoter</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.sxrhal</name>
         <version>1.0</version>
@@ -917,6 +1246,17 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.systemhelperaidl</name>
+        <interface>
+            <name>ISystemEvent</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>ISystemResource</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.trustedui</name>
         <version>1.0-2</version>
@@ -931,6 +1271,17 @@
             <instance>qtee-vm</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.trustedui</name>
+        <interface>
+            <name>ITrustedInput</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>ITrustedUI</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.tui_comm</name>
         <version>1.0</version>
@@ -948,6 +1299,13 @@
             <instance>vppService</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.vpp</name>
+        <interface>
+            <name>IVppService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wifi.hostapd</name>
         <version>1.0-3</version>
@@ -965,6 +1323,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.wifi.supplicant</name>
+        <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>
@@ -973,6 +1338,13 @@
             <instance>wificfr</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.wifi.wificfr</name>
+        <interface>
+            <name>IWificfr</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wifi.wifilearner</name>
         <version>1.0</version>
@@ -989,6 +1361,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.wifi.wifimyftm</name>
+        <interface>
+            <name>IWifiMyFtm</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wigig.netperftuner</name>
         <version>1.0</version>
@@ -1021,6 +1400,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.ims.datachannelservice</name>
+        <version>1-2</version>
+        <interface>
+            <name>IDataChannelService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.ims.factory</name>
         <version>1.0-1</version>
@@ -1030,6 +1417,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.ims.factoryaidlservice</name>
+        <interface>
+            <name>IImsFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.imsrtpservice</name>
         <version>3.0</version>
@@ -1047,6 +1441,20 @@
             <instance>mstatservice</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.qccvndhal_aidl</name>
+        <interface>
+            <name>IQccvndhal</name>
+            <instance>qccvndhal</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.qepi</name>
+        <interface>
+            <name>IQEPI</name>
+            <instance>qepi</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.qspmhal</name>
         <version>1.0</version>
@@ -1055,6 +1463,28 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.qspmhal</name>
+        <interface>
+            <name>IQspmhal</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.qvirt</name>
+        <interface>
+            <name>IVirtualizationService</name>
+            <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="true">
         <name>vendor.qti.voiceprint</name>
         <version>1.0</version>
diff --git a/omni_zenfone9.mk b/omni_zenfone9.mk
index 4fcf616..c485116 100644
--- a/omni_zenfone9.mk
+++ b/omni_zenfone9.mk
@@ -62,6 +62,6 @@
     TARGET_DEVICE=AI2202 \
     TARGET_PRODUCT=WW_AI2202
 
-VENDOR_RELEASE := 13/TKQ1.220807.001/33.0804.2060.142:user/release-keys
+VENDOR_RELEASE := 14/UKQ1.230924.001/34.0304.2004.87:user/release-keys
 BUILD_FINGERPRINT := asus/WW_AI2202/ASUS_AI2202:$(VENDOR_RELEASE)
 OMNI_BUILD_FINGERPRINT := asus/WW_AI2202/ASUS_AI2202:$(VENDOR_RELEASE)
diff --git a/prebuilt/system/etc/permissions/privapp-permissions-qti.xml b/prebuilt/system/etc/permissions/privapp-permissions-qti.xml
index 380b7bd..75f7f1b 100644
--- a/prebuilt/system/etc/permissions/privapp-permissions-qti.xml
+++ b/prebuilt/system/etc/permissions/privapp-permissions-qti.xml
@@ -88,6 +88,11 @@
         <permission name="android.permission.CALL_PRIVILEGED"/>
     </privapp-permissions>
 
+    <privapp-permissions package="org.codeaurora.bluetooth.batestapp">
+        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
+        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
+    </privapp-permissions>
+
     <privapp-permissions package="org.codeaurora.snapcam">
         <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
         <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
diff --git a/prebuilt/system/etc/public.libraries-qti.txt b/prebuilt/system/etc/public.libraries-qti.txt
index 2868929..99b07c7 100644
--- a/prebuilt/system/etc/public.libraries-qti.txt
+++ b/prebuilt/system/etc/public.libraries-qti.txt
@@ -1,3 +1,3 @@
-libvraudio_client.qti.so
 libbinauralrenderer_wrapper.qti.so
 libhoaeffects.qti.so
+libQOC.qti.so
diff --git a/prebuilt/system/etc/sysconfig/qti_whitelist.xml b/prebuilt/system/etc/sysconfig/qti_whitelist.xml
index 0d0d83d..306dcd3 100644
--- a/prebuilt/system/etc/sysconfig/qti_whitelist.xml
+++ b/prebuilt/system/etc/sysconfig/qti_whitelist.xml
@@ -112,7 +112,5 @@
     <hidden-api-whitelisted-app package="com.qualcomm.qti.server.wigigapp" />
     <!-- These are location components that need to freely run in the background -->
     <allow-in-power-save package="com.qualcomm.location" />
-    <allow-in-power-save package="com.qualcomm.location.XT" />
-    <allow-in-power-save package="com.qualcomm.location.XT.setup" />
     <hidden-api-whitelisted-app package="com.qti.service.colorservice" />
 </config>
diff --git a/prebuilt/system_ext/etc/public.libraries-qti.txt b/prebuilt/system_ext/etc/public.libraries-qti.txt
index 42e461b..d0da9fa 100644
--- a/prebuilt/system_ext/etc/public.libraries-qti.txt
+++ b/prebuilt/system_ext/etc/public.libraries-qti.txt
@@ -1,6 +1,6 @@
 libupdateprof.qti.so
 libthermalclient.qti.so
+libQOC.qti.so
 libdiag_system.qti.so
 libqape.qti.so
-libqesdk_ndk_platform.qti.so
 liblistenjni.qti.so
diff --git a/prebuilt/vendor/etc/init/hw/init.asus.rc b/prebuilt/vendor/etc/init/hw/init.asus.rc
index cfe40d0..3cc439c 100644
--- a/prebuilt/vendor/etc/init/hw/init.asus.rc
+++ b/prebuilt/vendor/etc/init/hw/init.asus.rc
@@ -222,6 +222,15 @@
     disabled
 # Touch ---
 
+#for audio
+service dongle /vendor/bin/dongle
+    user root
+    group root
+    disabled
+    oneshot
+    seclabel u:r:zf_dongle:s0
+#for audio
+
 ###-----------------------------------------------###
 #                ALL ASUS service (end)
 # 
@@ -458,6 +467,14 @@
    write /sys/devices/platform/soc/990000.i2c/i2c-0/0-0038/fts_xy_resize 1
 # Touch ---
 
+# Fingerprint +++
+on property:sys.boot_completed=1
+   setprop vendor.screen.turning-off 0
+
+on property:vendor.screen.turning-off=*
+   setprop vendor.screen.turningoff	${vendor.screen.turning-off}
+# Fingerprint ---
+
 # ASUS_BSP +++ set btsnoop_status property
 on property:persist.bluetooth.btsnooplogmode=filtered
 setprop debug.bluetooth.btsnoop_status start
@@ -513,6 +530,15 @@
 # ASUS_BSP Proximity: add command for double tap
 on property:vendor.proximity.get_status=1
 	start service_get_pstatus
+
+#for audio+++
+on property:vendor.audio.dongle=true
+    start dongle
+#for audio---
+
+on property:sys.boot_completed=1
+    rm /mnt/vendor/persist/data/pfm/licenses/qwes_platform_license.pfm.inst
+
 ###-----------------------------------------------###
 #              ALL ASUS on property (end)
 # 
diff --git a/product.prop b/product.prop
index 27124c0..25c5023 100644
--- a/product.prop
+++ b/product.prop
@@ -14,7 +14,6 @@
 persist.sys.notchui.enable=1
 persist.sys.thermal_policy_update=1
 ro.surface_flinger.set_idle_timer_ms=1500
-ro.surface_flinger.enable_frame_rate_override=1
 debug.sf.frame_rate_multiple_threshold=120
 
 # Bluetooth
diff --git a/proprietary-files-product.txt b/proprietary-files-product.txt
index 8f947e3..bf73537 100644
--- a/proprietary-files-product.txt
+++ b/proprietary-files-product.txt
@@ -1,5 +1,5 @@
 # Alarm
--product/app/PowerOffAlarm/PowerOffAlarm.apk
+-system_ext/app/PowerOffAlarm/PowerOffAlarm.apk
 -system_ext/framework/vendor.qti.hardware.alarm-V1.0-java.jar
 system_ext/lib64/vendor.qti.hardware.alarm@1.0.so
 
@@ -12,8 +12,6 @@
 # QTI Telephony
 -system_ext/app/DynamicDDSService/DynamicDDSService.apk
 -product/app/uimgbaservice/uimgbaservice.apk
--system_ext/framework/embmslibrary.jar
-system_ext/etc/permissions/embms.xml
 system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml
 product/etc/permissions/UimGba.xml
 product/etc/permissions/UimGbaManager.xml
@@ -96,7 +94,6 @@
 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
-system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so
 system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so
 system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so
 system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so
@@ -146,9 +143,6 @@
 
 system_ext/lib64/vendor.qti.hardware.qteeconnector@1.0.so
 
-# Secure
-system_ext/lib64/vendor.qti.hardware.tui_comm@1.0.so
-
 # System Helper
 system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so
 system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index e20ae22..a0cbaf4 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -42,6 +42,7 @@
 vendor/bin/RestoreCalibrationData
 vendor/bin/SkuInfo
 vendor/bin/StoreKeybox
+vendor/bin/TAClient
 vendor/bin/TrustedUISampleTest
 vendor/bin/WiFiMaxPower
 vendor/bin/[
@@ -51,6 +52,7 @@
 vendor/bin/agmcompressplay
 vendor/bin/agmplay
 vendor/bin/asus_native_sensor
+vendor/bin/asuskey_wv_install
 vendor/bin/athdiag
 vendor/bin/audioadsprpcd
 vendor/bin/audioflacapp
@@ -399,7 +401,6 @@
 vendor/etc/display/qdcm_calib_data_sharp_1080p_cmd_mode_dsi_panel.json
 vendor/etc/display/thermallevel_to_fps.xml
 vendor/etc/dpm_vndr/vendor.dpm.conf
-vendor/etc/ecc_list.json
 vendor/etc/eva/facedetection/model3.dat
 vendor/etc/excluded-input-devices.xml
 vendor/etc/face3d/qcnn_concat_file_model-0324_2_encrypted
@@ -450,8 +451,8 @@
 vendor/etc/init/android.hardware.keymaster@4.1-javacard.service.rc
 vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc
 vendor/etc/init/android.hardware.neuralnetworks-shim-service-qti.rc
-vendor/etc/init/android.hardware.nfc@1.2-service.rc
-vendor/etc/init/android.hardware.secure_element@1.2-service.rc
+vendor/etc/init/android.hardware.nfc_snxxx@1.2-service.rc
+vendor/etc/init/android.hardware.secure_element_snxxx@1.2-service.rc
 vendor/etc/init/android.hardware.security.keymint-service-qti.rc
 vendor/etc/init/android.hardware.sensors@2.1-service-multihal.rc
 vendor/etc/init/android.hardware.thermal@2.0-service.qti-v2.rc
@@ -511,6 +512,7 @@
 vendor/etc/init/shsusrd.rc
 vendor/etc/init/ssgtzd.rc
 vendor/etc/init/sxrd.rc
+vendor/etc/init/taclient.rc
 vendor/etc/init/trusteduilistener.rc
 vendor/etc/init/vendor.display.color@1.0-service.rc
 vendor/etc/init/vendor.dpmd.rc
@@ -682,6 +684,7 @@
 vendor/etc/qcril_database/upgrade/config/7.0_config.sql
 vendor/etc/qcril_database/upgrade/config/8.0_config.sql
 vendor/etc/qcril_database/upgrade/config/9.0_config.sql
+vendor/etc/qcril_database/upgrade/config/90.0_config.sql
 vendor/etc/qcril_database/upgrade/other/0_initial_qcrilnr.sql
 vendor/etc/qcril_database/upgrade/other/10_version_update_ecc_table.sql
 vendor/etc/qcril_database/upgrade/other/11_version_update_ecc_table.sql
@@ -693,6 +696,7 @@
 vendor/etc/qcril_database/upgrade/other/6_version_change_property_table_qcrilnr.sql
 vendor/etc/qcril_database/upgrade/other/7_version_update_ecc_table_qcrilnr.sql
 vendor/etc/qcril_database/upgrade/other/8_version_update_ecc_table.sql
+vendor/etc/qcril_database/upgrade/other/90_version_update_ecc_table.sql
 vendor/etc/qcril_database/upgrade/other/9_version_update_ecc_table.sql
 vendor/etc/qguard.json
 vendor/etc/qvr/cfg/339/0/65536/mtp855.txt
@@ -1258,6 +1262,17 @@
 vendor/firmware/cdsp.b17
 vendor/firmware/cdsp.mbn
 vendor/firmware/cdsp.mdt
+vendor/firmware/drmtestapp64.b00
+vendor/firmware/drmtestapp64.b01
+vendor/firmware/drmtestapp64.b02
+vendor/firmware/drmtestapp64.b03
+vendor/firmware/drmtestapp64.b04
+vendor/firmware/drmtestapp64.b05
+vendor/firmware/drmtestapp64.b06
+vendor/firmware/drmtestapp64.b07
+vendor/firmware/drmtestapp64.b08
+vendor/firmware/drmtestapp64.mbn
+vendor/firmware/drmtestapp64.mdt
 vendor/firmware/dxhdcp2.b00
 vendor/firmware/dxhdcp2.b01
 vendor/firmware/dxhdcp2.b02
@@ -1582,9 +1597,6 @@
 vendor/lib/android.hardware.keymaster@4.0.so
 vendor/lib/android.hardware.keymaster@4.1.so
 vendor/lib/android.hardware.media.c2@1.0.so
-vendor/lib/android.hardware.nfc@1.0.so
-vendor/lib/android.hardware.nfc@1.1.so
-vendor/lib/android.hardware.nfc@1.2.so
 vendor/lib/android.hardware.radio.config@1.0.so
 vendor/lib/android.hardware.radio.config@1.1.so
 vendor/lib/android.hardware.radio.config@1.2.so
@@ -1787,10 +1799,7 @@
 vendor/lib/egl/libVkLayer_ADRENO_qprofiler.so
 vendor/lib/egl/libq3dtools_adreno.so
 vendor/lib/egl/libq3dtools_esx.so
-vendor/lib/ese_client.so
-vendor/lib/ese_spi_nxp.so
 vendor/lib/ftm_fm_lib.so
-vendor/lib/hal_libnfc.so
 vendor/lib/hw/android.hardware.bluetooth.audio@2.0-impl.so
 vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so
 vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so
@@ -2268,7 +2277,6 @@
 vendor/lib/libxtadapter.so
 vendor/lib/mediadrm/libwvdrmengine.so
 vendor/lib/modules
-vendor/lib/nfc_nci_nxp.so
 vendor/lib/qcrilInterfaces.so
 vendor/lib/qcrilMarshal.so
 vendor/lib/qcrilNrQmiModule.so
@@ -2394,10 +2402,6 @@
 vendor/lib/vendor.libdpmframework.so
 vendor/lib/vendor.libdpmtcm.so
 vendor/lib/vendor.libmwqemiptablemgr.so
-vendor/lib/vendor.nxp.eventprocessor@1.0.so
-vendor/lib/vendor.nxp.nxpese@1.0.so
-vendor/lib/vendor.nxp.nxpnfc@2.0.so
-vendor/lib/vendor.nxp.nxpnfclegacy@1.0.so
 vendor/lib/vendor.qti.data.factory@2.0.so
 vendor/lib/vendor.qti.data.factory@2.1.so
 vendor/lib/vendor.qti.data.factory@2.2.so
@@ -2840,10 +2844,8 @@
 vendor/lib64/egl/libVkLayer_ADRENO_qprofiler.so
 vendor/lib64/egl/libq3dtools_adreno.so
 vendor/lib64/egl/libq3dtools_esx.so
-vendor/lib64/ese_client.so
-vendor/lib64/ese_spi_nxp.so
+vendor/lib64/ese_spi_nxp_snxxx.so
 vendor/lib64/ftm_fm_lib.so
-vendor/lib64/hal_libnfc.so
 vendor/lib64/hw/android.hardware.bluetooth.audio@2.0-impl.so
 vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
 vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
@@ -2880,6 +2882,7 @@
 vendor/lib64/hw/vendor.qti.hardware.servicetracker@1.2-impl.so
 vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
 vendor/lib64/hw/vulkan.adreno.so
+vendor/lib64/jcos_client.so
 vendor/lib64/lib-imscommon.so
 vendor/lib64/lib-imsdpl.so
 vendor/lib64/lib-imsqimf.so
@@ -3024,7 +3027,7 @@
 vendor/lib64/libdiag.so
 vendor/lib64/libdiagjni.so
 vendor/lib64/libdigital-dimming.so
-vendor/lib64/libdiracgefwrapper.so
+vendor/lib64/libdirac.so
 vendor/lib64/libdisp-aba.so
 vendor/lib64/libdisplayqos.so
 vendor/lib64/libdisplayskuutils.so
@@ -3402,7 +3405,7 @@
 vendor/lib64/libz_stable.so
 vendor/lib64/ls_client.so
 vendor/lib64/mediadrm/libwvdrmengine.so
-vendor/lib64/nfc_nci_nxp.so
+vendor/lib64/nfc_nci_nxp_snxxx.so
 vendor/lib64/qcrilInterfaces.so
 vendor/lib64/qcrilMarshal.so
 vendor/lib64/qcrilNrQmiModule.so
@@ -3412,6 +3415,7 @@
 vendor/lib64/qtiPeripheralMgr.so
 vendor/lib64/qtiril-utils.so
 vendor/lib64/qtiwakelock.so
+vendor/lib64/se_extn_client.so
 vendor/lib64/sensors.ssc.so
 vendor/lib64/soundfx/libasphere.so
 vendor/lib64/soundfx/libaudiopreprocessing.so
@@ -3444,10 +3448,8 @@
 vendor/lib64/vendor.libdpmframework.so
 vendor/lib64/vendor.libdpmtcm.so
 vendor/lib64/vendor.libmwqemiptablemgr.so
-vendor/lib64/vendor.nxp.eventprocessor@1.0.so
 vendor/lib64/vendor.nxp.nxpese@1.0.so
 vendor/lib64/vendor.nxp.nxpnfc@2.0.so
-vendor/lib64/vendor.nxp.nxpnfclegacy@1.0.so
 vendor/lib64/vendor.qti.data.factory@2.0.so
 vendor/lib64/vendor.qti.data.factory@2.1.so
 vendor/lib64/vendor.qti.data.factory@2.2.so
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 44a0509..e161fc4 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -54,7 +54,6 @@
 system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.3.so
 
 # Device
--system_ext/app/DeviceInfo/DeviceInfo.apk
 -system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk
 system_ext/lib64/libsystemhelper_jni.so
 
@@ -92,16 +91,14 @@
 # GPS
 system_ext/etc/permissions/com.qti.location.sdk.xml
 system_ext/etc/permissions/com.qualcomm.location.xml
-system_ext/etc/permissions/izat.xt.srv.xml
 system_ext/etc/permissions/privapp-permissions-com.qualcomm.location.xml
 system_ext/etc/permissions/com.qualcomm.qti.izattools.xml
 -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
 
 # HotwordEnrollment
--product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk;PRESIGNED
--product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_NARROWBAND/HotwordEnrollmentOKGoogleHEXAGON_NARROWBAND.apk;PRESIGNED
+-product/priv-app/HotwordEnrollmentXGoogleHEXAGON_NARROWBAND/HotwordEnrollmentXGoogleHEXAGON_NARROWBAND.apk;PRESIGNED
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 -system_ext/framework/com.android.hotwordenrollment.common.util.jar
 
diff --git a/system.prop b/system.prop
index 0b3e409..637b098 100644
--- a/system.prop
+++ b/system.prop
@@ -68,11 +68,24 @@
 #System props for BT
 ro.bluetooth.library_name=libbluetooth_qti.so
 persist.vendor.btstack.aac_frm_ctl.enabled=true
+persist.vendor.qcom.bluetooth.aptxadaptiver2_2_support=true
+persist.vendor.btstack.enable.twsplus=false
+persist.vendor.btstack.enable.twsplussho=false
+persist.vendor.btstack.twsplus.monosupport=false
 persist.bluetooth.avrcpversion=avrcp16
+# ASUS_BSP "Enable IOT logging"+++
+persist.vendor.service.bt.iotinfo.report.enable=true
+# ASUS_BSP "Enable IOT logging"---
+#Enable inband ringing
 persist.bluetooth.disableinbandringing=false
 # ASUS BSP Bluetooth: enable SWB
 persist.vendor.qcom.bluetooth.enable.swb=true
 persist.vendor.qcom.bluetooth.enable.swbpm=true
+# ASUS_BSP "Enable BQR"+++
+persist.bluetooth.bqr.event_mask=262238
+persist.bluetooth.bqr.min_interval_ms=60000
+persist.bluetooth.bqr.choppy_threshold=3,3
+# ASUS_BSP "Enable BQR"---
 #system prop for RmNet Data
 persist.rmnet.data.enable=true
 persist.data.wda.enable=true
@@ -88,7 +101,7 @@
 ##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
+debug.sf.enable_hwc_vds=0
 #property to latch unsignaled buffer
 debug.sf.latch_unsignaled=1
 # enable tunnel encoding for amrwb
@@ -120,9 +133,6 @@
 persist.vendor.radio.atfwd.start=true
 ro.kernel.qemu.gles=0
 qemu.hw.mainkeys=0
-# ASUS_BSP "Enable IOT logging"+++
-persist.vendor.service.bt.iotinfo.report.enable=true
-# ASUS_BSP "Enable IOT logging"---
 #Expose aux camera for below packages
 #vendor.camera.aux.packagelist=org.codeaurora.snapcam
 #Add snapcam in privapp list
@@ -166,31 +176,11 @@
 ####################################
 debug.atrace.tags.enableflags=0
 persist.traced.enable=1
-log.tag.CCodec=I
-log.tag.MediaCodec=I
-log.tag.MediaPlayerService=I
-log.tag.CCodecBufferChannel=I
-log.tag.MediaCodecSource=I
-log.tag.NuPlayerRenderer=I
-log.tag.NuPlayerDecoder=I
-log.tag.NuPlayer=I
-log.tag.MPEG4Writer=I
-log.tag.CCodecBuffers=I
-log.tag.CCodecConfig=I
-log.tag.MediaCodecList=I
-log.tag.FrameDecoder=I
-log.tag.MediaMetadataRetriever=I
-log.tag.MediaCodecsXmlParser=I
-log.tag.NuPlayerDriver=I
-log.tag.StagefrightRecorder=I
-log.tag.GenericSource=I
-log.tag.GraphicBufferSource=I
 dalvik.vm.image-dex2oat-Xms=64m
 dalvik.vm.image-dex2oat-Xmx=64m
 dalvik.vm.dex2oat-Xms=64m
 dalvik.vm.dex2oat-Xmx=512m
 dalvik.vm.usejit=true
-dalvik.vm.usejitprofiles=true
 dalvik.vm.dexopt.secondary=true
 dalvik.vm.dexopt.thermal-cutoff=2
 dalvik.vm.appimageformat=lz4
@@ -198,6 +188,7 @@
 pm.dexopt.first-boot=verify
 pm.dexopt.boot-after-ota=verify
 pm.dexopt.post-boot=extract
+pm.dexopt.boot-after-mainline-update=verify
 pm.dexopt.install=speed-profile
 pm.dexopt.install-fast=skip
 pm.dexopt.install-bulk=speed-profile
@@ -216,6 +207,12 @@
 dalvik.vm.madvise.vdexfile.size=104857600
 dalvik.vm.madvise.odexfile.size=104857600
 dalvik.vm.madvise.artfile.size=4294967295
+dalvik.vm.usap_pool_enabled=false
+dalvik.vm.usap_refill_threshold=1
+dalvik.vm.usap_pool_size_max=3
+dalvik.vm.usap_pool_size_min=1
+dalvik.vm.usap_pool_refill_delay_ms=3000
+dalvik.vm.useartservice=true
 persist.device_config.runtime_native_boot.iorap_perfetto_enable=true
 ####################################
 # from variable PRODUCT_SYSTEM_DEFAULT_PROPERTIES
diff --git a/system_ext.prop b/system_ext.prop
index 99572ee..ab603ae 100644
--- a/system_ext.prop
+++ b/system_ext.prop
@@ -6,7 +6,7 @@
 vendor.camera.aux.packagelist=org.omnirom.snap,com.googlecamera.wichaya,com.asus.camera
 persist.vendor.camera.privapp.list=com.asus.camera
 
-# ASUS_BSP Add for Dirac sound effect feature
+#ASUS_BSP Add for Dirac sound effect feature +++
 ro.vendor.dirac.acs.rotation=true
 ro.vendor.dirac.acs.ignore_updates_in_call=true
 ro.vendor.dirac.acs.no_usermsg=true
@@ -15,3 +15,5 @@
 ro.vendor.dirac.gef.ext.appt=0x1,0x4,0x8,0x10
 ro.vendor.dirac.gef.ext.did=0x4,0x8,0x80,0x4000,0x4000000
 ro.vendor.dirac.gef.exs.did=0x4,0x8,0x80,0x4000,0x4000000
+ro.vendor.dirac.gef.exs.appt=0x4
+#ASUS_BSP Add for Dirac sound effect feature ---