diff --git a/Android.mk b/Android.mk
index 06fcf90a3789ff81d21b97ede1dd5b8dfa687165..56ed1db6c15c3edbb2b017475f53449690eab487 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,4 +10,24 @@ ifneq ($(filter emerald zirconia,$(TARGET_DEVICE)),)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
-endif
\ No newline at end of file
+VENDOR_SYMLINKS := \
+    $(TARGET_OUT_VENDOR)/lib \
+    $(TARGET_OUT_VENDOR)/lib64 \
+    $(TARGET_OUT_VENDOR)/lib/hw \
+    $(TARGET_OUT_VENDOR)/lib64/hw
+
+$(VENDOR_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
+	$(hide) echo "Making vendor symlinks"
+	@mkdir -p $(TARGET_OUT_VENDOR)/lib/hw
+	@mkdir -p $(TARGET_OUT_VENDOR)/lib64/hw
+	@ln -sf $(TARGET_BOARD_PLATFORM)/libdpframework.so $(TARGET_OUT_VENDOR)/lib/libdpframework.so
+	@ln -sf $(TARGET_BOARD_PLATFORM)/libpq_prot.so $(TARGET_OUT_VENDOR)/lib/libpq_prot.so
+	@ln -sf $(TARGET_BOARD_PLATFORM)/libmtk_drvb.so $(TARGET_OUT_VENDOR)/lib/libmtk_drvb.so
+	@ln -sf $(TARGET_BOARD_PLATFORM)/libdpframework.so $(TARGET_OUT_VENDOR)/lib64/libdpframework.so
+	@ln -sf $(TARGET_BOARD_PLATFORM)/libpq_prot.so $(TARGET_OUT_VENDOR)/lib64/libpq_prot.so
+	@ln -sf $(TARGET_BOARD_PLATFORM)/libmtk_drvb.so $(TARGET_OUT_VENDOR)/lib64/libmtk_drvb.so
+	$(hide) touch $@
+
+ALL_DEFAULT_INSTALLED_MODULES += $(VENDOR_SYMLINKS)
+
+endif
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ee9d5fe52a75d6bf6cbd18f178b201d71e11c98f..5333a925602dfad0225107037287e7975f4179a4 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -97,10 +97,10 @@ TARGET_USERIMAGES_USE_EXT4 := true
 ENABLE_VENDOR_RIL_SERVICE := true
 
 # Security patch level
-VENDOR_SECURITY_PATCH := 2021-10-05
+VENDOR_SECURITY_PATCH := 2022-06-05
 
 # Sepolicy
-include device/mediatek/sepolicy/BoardSEPolicyConfig.mk
+include device/mediatek/sepolicy_vndr/SEPolicy.mk
 BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 
 # Inherit the proprietary files
diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml
index 9718ef9890051a6e41a6593614f61a688f3d24fe..2661a05764827f3b0b8504ccc7c7fb6b177edc14 100644
--- a/configs/audio/audio_policy_configuration.xml
+++ b/configs/audio/audio_policy_configuration.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
     <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
 
     <!-- Global configuration Decalaration -->
@@ -52,165 +52,177 @@
                 <item>FM Tuner In</item>
                 <item>Voice Call In</item>
                 <item>Echo Ref In</item>
+                <item>Telephony Tx</item>
             </attachedDevices>
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="deep_buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="primary input" role="sink" maxOpenCount="1" maxActiveCount="1">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
                 <mixPort name="incall_music_uplink" role="source" flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="voice tx" role="sink" maxOpenCount="1" maxActiveCount="1">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
                 <mixPort name="FM Tuner input" role="sink" maxOpenCount="1" maxActiveCount="1">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
                 <mixPort name="voip_tx" role="sink" flags="AUDIO_INPUT_FLAG_VOIP_TX" maxOpenCount="1" maxActiveCount="1">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
                 <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_FAST" maxOpenCount="1" maxActiveCount="1">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
+                <mixPort name="hifi_playback" role="source"/>
+                <mixPort name="hifi_input" role="sink"/>
             </mixPorts>
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
                 <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
                 </devicePort>
                 <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="AUX Digital Out" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Analog Dock Headset" type="AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Digital Dock Headset" type="AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="FM Tuner Out" type="AUDIO_DEVICE_OUT_FM" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
-
-                <devicePort tagName="USB Primary Out" type="AUDIO_DEVICE_OUT_BUS" role="sink" address="usb_phone_call">
+                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
+                </devicePort>
+                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
                 <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="AUX Digital In" type="AUDIO_DEVICE_IN_AUX_DIGITAL" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
                 <devicePort tagName="FM Tuner In" type="AUDIO_DEVICE_IN_FM_TUNER" role="source">
                      <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" role="source">
                      <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
-                <devicePort tagName="USB Primary In" type="AUDIO_DEVICE_IN_BUS" role="source" address="usb_phone_call">
-                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
+                </devicePort>
+                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="Voice Call In" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source">
                      <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
+                             samplingRates="8000 16000 32000 44100 48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
+                     <gains>
+                        <gain name="gain_1" mode="AUDIO_GAIN_MODE_JOINT"
+                              minValueMB="-8400"
+                              maxValueMB="4000"
+                              defaultValueMB="0"
+                              stepValueMB="100"/>
+                    </gains>
                 </devicePort>
             </devicePorts>
             <!-- route declaration, i.e. list all available sources for a given sink -->
@@ -225,6 +237,10 @@
                        sources="primary output,deep_buffer,FM Tuner In,Voice Call In"/>
                 <route type="mix" sink="AUX Digital Out"
                        sources="primary output"/>
+                <route type="mix" sink="USB Device Out"
+                       sources="primary output,deep_buffer,FM Tuner In,Voice Call In,hifi_playback"/>
+                <route type="mix" sink="USB Headset Out"
+                       sources="primary output,deep_buffer,FM Tuner In,Voice Call In,hifi_playback"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep_buffer,Voice Call In"/>
                 <route type="mix" sink="BT SCO Headset"
@@ -235,20 +251,22 @@
                        sources="primary output"/>
                 <route type="mix" sink="Digital Dock Headset"
                        sources="primary output"/>
-                <route type="mix" sink="voice tx"
-                       sources="Voice Call In"/>
                 <route type="mix" sink="FM Tuner Out"
                        sources="primary output"/>
-                <route type="mix" sink="USB Primary Out"
-                       sources="primary output,Voice Call In"/>
+                <route type="mix" sink="Telephony Tx"
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,USB Device In,USB Headset In,incall_music_uplink"/>
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,AUX Digital In,USB Primary In"/>
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,AUX Digital In,USB Device In,USB Headset In"/>
+                <route type="mix" sink="voice tx"
+                       sources="Voice Call In"/>
                 <route type="mix" sink="FM Tuner input"
                        sources="FM Tuner In,Echo Ref In"/>
+                <route type="mix" sink="hifi_input"
+                       sources="USB Device In,USB Headset In"/>
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,AUX Digital In,USB Primary In"/>
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,AUX Digital In,USB Device In,USB Headset In"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,AUX Digital In,USB Primary In"/>
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,AUX Digital In,USB Device In,USB Headset In"/>
             </routes>
 
         </module>
diff --git a/configs/audio/bluetooth_audio_policy_configuration.xml b/configs/audio/bluetooth_offload_audio_policy_configuration.xml
similarity index 75%
rename from configs/audio/bluetooth_audio_policy_configuration.xml
rename to configs/audio/bluetooth_offload_audio_policy_configuration.xml
index ce78eb00319d2f68587b8b52887111ea648c5900..4b6022b844c08b418f40ee4a18a333baf7111983 100644
--- a/configs/audio/bluetooth_audio_policy_configuration.xml
+++ b/configs/audio/bluetooth_offload_audio_policy_configuration.xml
@@ -7,25 +7,25 @@
         <!-- Hearing AIDs Audio Ports -->
         <mixPort name="hearing aid output" role="source">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="24000,16000"
+                     samplingRates="24000 16000"
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
     </mixPorts>
     <devicePorts>
         <!-- A2DP Audio Ports -->
-        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
+        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_LHDC AUDIO_FORMAT_LHDC_LL">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100,48000,88200,96000"
+                     samplingRates="44100 48000 88200 96000"
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </devicePort>
-        <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
+        <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink" encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_LHDC AUDIO_FORMAT_LHDC_LL">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100,48000,88200,96000"
+                     samplingRates="44100 48000 88200 96000"
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </devicePort>
-        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
+        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink" encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_LHDC AUDIO_FORMAT_LHDC_LL">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100,48000,88200,96000"
+                     samplingRates="44100 48000 88200 96000"
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </devicePort>
         <!-- Hearing AIDs Audio Ports -->
diff --git a/configs/audio/usb_audio_policy_configuration.xml b/configs/audio/usb_audio_accessory_only_policy_configuration.xml
similarity index 62%
rename from configs/audio/usb_audio_policy_configuration.xml
rename to configs/audio/usb_audio_accessory_only_policy_configuration.xml
index 5b8ddf9d7dc9d6929f248cf1ab0a0382e29cbd75..ab4f30f902eac3b3e92027cc9d3041420b775c6f 100644
--- a/configs/audio/usb_audio_policy_configuration.xml
+++ b/configs/audio/usb_audio_accessory_only_policy_configuration.xml
@@ -1,47 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!-- USB Audio HAL Audio Policy Configuration file -->
-
-<module name="usb" halVersion="2.0">
-    <mixPorts>
-        <mixPort name="usb_accessory output" role="source">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </mixPort>
-        <mixPort name="usb_device output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST"/>
-        <mixPort name="usb_device input" role="sink" flags="AUDIO_INPUT_FLAG_FAST"/>
-    </mixPorts>
-    <devicePorts>
-        <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </devicePort>
-        <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"/>
-        <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"/>
-        <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"/>
-        <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source"/>
-    </devicePorts>
-    <routes>
-        <route type="mix" sink="USB Host Out"
-               sources="usb_accessory output"/>
-        <route type="mix" sink="USB Device Out"
-               sources="usb_device output"/>
-        <route type="mix" sink="USB Headset Out"
-               sources="usb_device output"/>
-        <route type="mix" sink="usb_device input"
-               sources="USB Device In,USB Headset In"/>
-    </routes>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- USB Audio HAL Audio Policy Configuration file -->
+
+<module name="usb" halVersion="2.0">
+    <mixPorts>
+        <mixPort name="usb_accessory output" role="source">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+    </mixPorts>
+    <devicePorts>
+        <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </devicePort>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="USB Host Out"
+               sources="usb_accessory output"/>
+    </routes>
+</module>
\ No newline at end of file
diff --git a/configs/keylayouts/mtk-kpd.kl b/configs/keylayouts/mtk-kpd.kl
index 04780287419a9dab5953f9a0f9e4bb571f15004a..1ec5bf894fff3a34c3e69b65808c4315c4e6dd1c 100644
--- a/configs/keylayouts/mtk-kpd.kl
+++ b/configs/keylayouts/mtk-kpd.kl
@@ -1,117 +1,8 @@
-key 399   GRAVE
-key 2     1
-key 3     2
-key 4     3
-key 5     4
-key 6     5
-key 7     6
-key 8     7
-key 9     8
-key 10    9
-key 11    0
-key 158   BACK
-key 230   SOFT_RIGHT
-key 60    SOFT_RIGHT
-key 107   ENDCALL
-key 62    ENDCALL
-key 229   MENU
-key 139   MENU
-key 59    MENU
-key 127   SYM
-key 217   SEARCH
-key 228   POUND
-key 227   STAR
-key 231   CALL
-key 61    CALL
-key 232   DPAD_CENTER
-key 108   DPAD_DOWN
-key 103   DPAD_UP
-key 102   HOME
-key 105   DPAD_LEFT
-key 106   DPAD_RIGHT
-key 115   VOLUME_UP
+##
+## Mediatek Default Keylayout
+##
+
 key 114   VOLUME_DOWN
-key 113   MUTE
+key 115   VOLUME_UP
 key 116   POWER
-key 212   CAMERA
-key 211   FOCUS
-
-key 16    Q
-key 17    W
-key 18    E
-key 19    R
-key 20    T
-key 21    Y
-key 22    U
-key 23    I
-key 24    O
-key 25    P
-key 26    LEFT_BRACKET
-key 27    RIGHT_BRACKET
-key 43    BACKSLASH
-
-key 30    A
-key 31    S
-key 32    D
-key 33    F
-key 34    G
-key 35    H
-key 36    J
-key 37    K
-key 38    L
-key 39    SEMICOLON
-key 40    APOSTROPHE
-key 14    DEL
-
-key 44    Z
-key 45    X
-key 46    C
-key 47    V
-key 48    B
-key 49    N
-key 50    M
-key 51    COMMA
-key 52    PERIOD
-key 53    SLASH
-key 28    ENTER
-
-key 56    ALT_LEFT
-key 100   ALT_RIGHT
-key 42    SHIFT_LEFT
-key 54    SHIFT_RIGHT
-key 15    TAB
-key 57    SPACE
-key 150   EXPLORER
-key 155   ENVELOPE
-
-key 12    MINUS
-key 13    EQUALS
-key 215   AT
-
-key 164   MEDIA_PLAY_PAUSE
-key 128   MEDIA_STOP
-key 163   MEDIA_NEXT
-key 165   MEDIA_PREVIOUS
-key 168   MEDIA_REWIND
-key 159   MEDIA_FAST_FORWARD
-# add Armin FingerPrint long touch
-key 188    F18
-key 189    F19
-key 252    AIASSIST
-
-key 452   TPGESTURE_UP
-key 453   TPGESTURE_DOWN
-key 454   TPGESTURE_LEFT
-key 455   TPGESTURE_RIGHT
-key 456   TPGESTURE_DOUBLE
-key 457   TPGESTURE_C
-key 458   TPGESTURE_E
-key 459   TPGESTURE_M
-key 460   TPGESTURE_O
-key 461   TPGESTURE_S
-key 462   TPGESTURE_V
-key 485   TPGESTURE_W
-key 486   TPGESTURE_Z
-key 487   TPGESTURE_ARROWUP
-key 488   TPGESTURE_ARROWRIGHT
-
+key 456   WAKEUP
diff --git a/configs/media/media_codecs.xml b/configs/media/media_codecs.xml
index 6487008490aed733d36cfd90a82705d7f876c009..db38165a17bd69716bec75702c9b2f74787166a7 100644
--- a/configs/media/media_codecs.xml
+++ b/configs/media/media_codecs.xml
@@ -81,7 +81,5 @@ Only the three quirks included above are recognized at this point:
         <Setting name="max-video-encoder-input-buffers" value="10" />
     </Settings>
     <Include href="media_codecs_mediatek_audio.xml" />
-    <Include href="media_codecs_mediatek_video.xml" />
     <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_google_video_le.xml" />
 </MediaCodecs>
diff --git a/configs/media/media_codecs_c2.xml b/configs/media/media_codecs_c2.xml
index 2a7296921ebc4c9f869257743b8f2c9e35e629f5..f0969c031352c9912e501b5dec0fa655cb8828c2 100644
--- a/configs/media/media_codecs_c2.xml
+++ b/configs/media/media_codecs_c2.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright (C) 2014 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -87,6 +87,108 @@
             <Limit name="sample-rate" ranges="8000" />
             <Limit name="bitrate" range="13000" />
         </MediaCodec>
+        <MediaCodec name="c2.mtk.adpcm-ms.decoder" type="audio/x-adpcm-ms">
+            <Alias name="OMX.MTK.AUDIO.DECODER.ADPCM.MS" />
+            <Limit name="channel-count" max="8" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.adpcm-dvi-ima.decoder" type="audio/x-adpcm-dvi-ima">
+            <Alias name="OMX.MTK.AUDIO.DECODER.ADPCM.DVI" />
+            <Limit name="channel-count" max="8" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.ape.decoder" type="audio/ape">
+            <Alias name="OMX.MTK.AUDIO.DECODER.APE" />
+            <Limit name="channel-count" max="2" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.alac.decoder" type="audio/alac">
+            <Alias name="OMX.MTK.AUDIO.DECODER.ALAC" />
+            <Limit name="channel-count" max="8" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.mp3.decoder" type="audio/mpeg" rank="5">
+            <Alias name="OMX.MTK.AUDIO.DECODER.MP3" />
+            <Limit name="channel-count" max="2" />
+            <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />
+            <Limit name="bitrate" range="8000-320000" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.mpeg2.decoder" type="video/mpeg2" >
+            <Limit name="size" min="16x16" max="2048x1088" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Feature name="adaptive-playback"/>
+            <Limit name="concurrent-instances" max="16" />
+            <Feature name="can-swap-width-height" value="1"/>
+            <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.hevc.decoder" type="video/hevc" >
+            <Alias name="OMX.MTK.VIDEO.DECODER.HEVC" />
+            <Limit name="size" min="16x16" max="3840x2160" />
+            <Limit name="blocks-per-second" range="1-491520" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Feature name="adaptive-playback"/>
+            <Feature name="can-swap-width-height" value="1"/>
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.mpeg4.decoder" type="video/mp4v-es" >
+            <Alias name="OMX.MTK.VIDEO.DECODER.MPEG4" />
+            <Limit name="size" min="16x16" max="2048x1088" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Feature name="adaptive-playback"/>
+            <Feature name="can-swap-width-height" value="1"/>
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.h263.decoder" type="video/3gpp" >
+            <Alias name="OMX.MTK.VIDEO.DECODER.H263" />
+            <Limit name="size" min="128x96" max="1408x1152" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Feature name="adaptive-playback"/>
+            <Feature name="can-swap-width-height" value="1"/>
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-1280x720" value="30" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.avc.decoder" type="video/avc" >
+            <Alias name="OMX.MTK.VIDEO.DECODER.AVC" />
+            <Limit name="size" min="64x64" max="3840x2160" />
+            <Quirk name="wants-NAL-fragments" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Feature name="adaptive-playback"/>
+            <Feature name="can-swap-width-height" value="1"/>
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.vpx.decoder" type="video/x-vnd.on2.vp8" >
+            <Alias name="OMX.MTK.VIDEO.DECODER.VPX" />
+            <Limit name="size" min="16x16" max="1920x1088" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Feature name="adaptive-playback"/>
+            <Feature name="can-swap-width-height" value="1"/>
+            <Limit name="concurrent-instances" max="16" />
+            <Attribute name="software-codec" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.vp9.decoder" type="video/x-vnd.on2.vp9" >
+            <Alias name="OMX.MTK.VIDEO.DECODER.VP9" />
+            <Limit name="size" min="16x16" max="3840x2160" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Feature name="adaptive-playback"/>
+            <Feature name="can-swap-width-height" value="1"/>
+            <Limit name="concurrent-instances" max="16" />
+            <Attribute name="software-codec" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.vc1.decoder" type="video/x-ms-wmv" >
+            <Alias name="OMX.MTK.VIDEO.DECODER.VC1" />
+            <Limit name="size" min="16x16" max="1920x1088" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="concurrent-instances" max="16" />
+            <Feature name="can-swap-width-height" value="1"/>
+            <Limit name="performance-point-1920x1088" value="30" />
+        </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es">
             <Alias name="OMX.google.mpeg4.decoder" />
             <!-- profiles and levels:  ProfileSimple : Level3 -->
@@ -205,6 +307,34 @@
             <Limit name="complexity" range="0-10"  default="5" />
             <Feature name="bitrate-modes" value="CBR" />
         </MediaCodec>
+        <MediaCodec name="c2.mtk.mpeg4.encoder" type="video/mp4v-es" >
+             <Alias name="OMX.MTK.VIDEO.ENCODER.MPEG4" />
+            <Limit name="size" min="176x144" max="640x480" />
+            <Limit name="alignment" value="16x16" />
+            <Limit name="block-size" value="16x16" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-640x480" value="30" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.h263.encoder" type="video/3gpp" >
+             <Alias name="OMX.MTK.VIDEO.ENCODER.H263" />
+            <Limit name="size" min="176x144" max="176x144" />
+            <Limit name="alignment" value="16x16" />
+            <Limit name="block-size" value="16x16" />
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Limit name="concurrent-instances" max="15" />
+            <Limit name="performance-point-640x480" value="30" />
+        </MediaCodec>
+        <MediaCodec name="c2.mtk.avc.encoder" type="video/avc" >
+             <Alias name="OMX.MTK.VIDEO.ENCODER.AVC" />
+            <Limit name="size" min="176x144" max="1920x1080" />
+            <Limit name="alignment" value="16x16" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="concurrent-instances" max="16" />
+            <Limit name="performance-point-1920x1080" value="30" />
+        </MediaCodec>
         <MediaCodec name="c2.android.h263.encoder" type="video/3gpp">
             <Alias name="OMX.google.h263.encoder" />
             <!-- profiles and levels:  ProfileBaseline : Level45 -->
diff --git a/configs/media/media_codecs_mediatek_audio.xml b/configs/media/media_codecs_mediatek_audio.xml
index 91aa078f5d3cfa3b3b97220b2fff687d50e2dc4a..f32f6411b5982d6483b3aa7aa6ef4e7ea4e9e79b 100644
--- a/configs/media/media_codecs_mediatek_audio.xml
+++ b/configs/media/media_codecs_mediatek_audio.xml
@@ -79,16 +79,26 @@ Only the three quirks included above are recognized at this point:
 <Included>
     <Decoders>
         <MediaCodec name="OMX.MTK.AUDIO.DECODER.MP3" type="audio/mpeg" rank="6">
+            <Limit name="channel-count" max="2" />
             <Quirk name="decoder-lies-about-number-of-channels" />
             <Quirk name="supports-multiple-frames-per-input-buffer" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.AUDIO.DECODER.GSM" type="audio/gsm" />
-        <MediaCodec name="OMX.MTK.AUDIO.DECODER.ADPCM.MS" type="audio/x-adpcm-ms" />
-        <MediaCodec name="OMX.MTK.AUDIO.DECODER.ADPCM.DVI" type="audio/x-adpcm-dvi-ima" />
+        <MediaCodec name="OMX.MTK.AUDIO.DECODER.GSM" type="audio/gsm" >
+            <Limit name="channel-count" max="1" />
+        </MediaCodec>
+        <MediaCodec name="OMX.MTK.AUDIO.DECODER.ADPCM.MS" type="audio/x-adpcm-ms" >
+            <Limit name="channel-count" max="8" />
+        </MediaCodec>
+        <MediaCodec name="OMX.MTK.AUDIO.DECODER.ADPCM.DVI" type="audio/x-adpcm-dvi-ima" >
+            <Limit name="channel-count" max="8" />
+        </MediaCodec>
         <MediaCodec name="OMX.MTK.AUDIO.DECODER.APE" type="audio/ape" >
+            <Limit name="channel-count" max="2" />
             <Quirk name="decoder-lies-about-number-of-channels" />
             <Quirk name="supports-multiple-frames-per-input-buffer" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.AUDIO.DECODER.ALAC" type="audio/alac" />
+        <MediaCodec name="OMX.MTK.AUDIO.DECODER.ALAC" type="audio/alac" >
+            <Limit name="channel-count" max="8" />
+        </MediaCodec>
     </Decoders>
 </Included>
diff --git a/configs/media/media_codecs_mediatek_video.xml b/configs/media/media_codecs_mediatek_video.xml
index 68ad24654bf8bae7678f1351984c6cec18ff13d3..09ef4dcffb6e2c1a0f566c42d91fda2899cbe9cf 100644
--- a/configs/media/media_codecs_mediatek_video.xml
+++ b/configs/media/media_codecs_mediatek_video.xml
@@ -153,13 +153,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-1920x1088" value="30" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.VIDEO.DECODER.XVID" type="video/xvid" >
-            <Limit name="size" min="16x16" max="2048x1088" />
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="concurrent-instances" max="16" />
-            <Limit name="performance-point-1920x1088" value="30" />
-        </MediaCodec>
     </Decoders>
 
     <Encoders>
diff --git a/configs/media/media_codecs_performance.xml b/configs/media/media_codecs_performance.xml
index 55417ecd795f32f40dc7e3581d8b61ec5ac11b8a..3e4c83f7651b93c2454f17ea93c63ce58b79d37d 100644
--- a/configs/media/media_codecs_performance.xml
+++ b/configs/media/media_codecs_performance.xml
@@ -79,34 +79,20 @@ Only the three quirks included above are recognized at this point:
 <MediaCodecs>
     <Encoders>
         <!-- MTK codec -->
-        <MediaCodec name="OMX.MTK.VIDEO.ENCODER.MPEG4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="235-818" />
+        <MediaCodec name="c2.mtk.mpeg4.encoder" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="46-102" />
             <Limit name="measured-frame-rate-0352x0288" range="145-506" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.VIDEO.ENCODER.H263" type="video/3gpp" update="true">
+        <MediaCodec name="c2.mtk.h263.encoder" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="136-300" />
             <Limit name="measured-frame-rate-0352x0288" range="107-235" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.VIDEO.ENCODER.AVC" type="video/avc" update="true">
+        <MediaCodec name="c2.mtk.avc.encoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="161-561" />
             <Limit name="measured-frame-rate-720x480" range="67-234" />
             <Limit name="measured-frame-rate-1280x720" range="29-102" />
         </MediaCodec>
         <!-- Google codec -->
-        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="188-653" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="165-573" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="104-361" />
-            <Limit name="measured-frame-rate-720x480" range="60-132" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="65-179" />
-            <Limit name="measured-frame-rate-640x360" range="45-156" />
-        </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="183-636" />
             <Limit name="measured-frame-rate-720x480" range="45-156" />
@@ -131,34 +117,35 @@ Only the three quirks included above are recognized at this point:
     </Encoders>
     <Decoders>
         <!-- MTK codec -->
-        <MediaCodec name="OMX.MTK.VIDEO.DECODER.MPEG4" type="video/mp4v-es" update="true">
+        <MediaCodec name="c2.mtk.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="350-550" />
             <Limit name="measured-frame-rate-480x360" range="136-474" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.VIDEO.DECODER.H263" type="video/3gpp" update="true">
+        <MediaCodec name="c2.mtk.h263.decoder" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="267-588" />
             <Limit name="measured-frame-rate-352x288" range="206-454" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.VIDEO.DECODER.AVC" type="video/avc" update="true">
+        <MediaCodec name="c2.mtk.avc.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="186-646" />
             <Limit name="measured-frame-rate-720x480" range="124-433" />
             <Limit name="measured-frame-rate-1280x720" range="74-256" />
             <Limit name="measured-frame-rate-1920x1080" range="50-110" />
         </MediaCodec>
-         <MediaCodec name="OMX.MTK.VIDEO.DECODER.HEVC" type="video/hevc" update="true">
+         <MediaCodec name="c2.mtk.hevc.decoder" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="335-737" />
+            <Limit name="measured-frame-rate-640x360" range="105-232" />
             <Limit name="measured-frame-rate-720x480" range="142-494" />
             <Limit name="measured-frame-rate-1280x720" range="75-262" />
             <Limit name="measured-frame-rate-1920x1080" range="74-162" />
             <Limit name="measured-frame-rate-3840x2160" range="14-48" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.VIDEO.DECODER.VPX" type="video/x-vnd.on2.vp8" update="true">
+        <MediaCodec name="c2.mtk.vpx.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="158-549" />
             <Limit name="measured-frame-rate-640x360" range="91-315" />
-            <Limit name="measured-frame-rate-1280x720" range="32-112" />
+            <Limit name="measured-frame-rate-1280x720" range="8-17" />
             <Limit name="measured-frame-rate-1920x1080" range="6-13" />
         </MediaCodec>
-        <MediaCodec name="OMX.MTK.VIDEO.DECODER.VP9" type="video/x-vnd.on2.vp9" update="true">
+        <MediaCodec name="c2.mtk.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x180" range="179-393" />
             <Limit name="measured-frame-rate-640x360" range="92-321" />
             <Limit name="measured-frame-rate-1280x720" range="40-138" />
@@ -166,41 +153,12 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-3840x2160" range="7-25" />
         </MediaCodec>
         <!-- Google codec -->
-        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="301-663" />
-            <Limit name="measured-frame-rate-480x360" range="100-250" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="156-350" />
-            <Limit name="measured-frame-rate-352x288" range="128-297" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="183-636" />
-            <Limit name="measured-frame-rate-720x480" range="45-156" />
-            <Limit name="measured-frame-rate-1280x720" range="10-22" />
-            <Limit name="measured-frame-rate-1920x1080" range="4-8" />
-        </MediaCodec>
-         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="182-634" />
-            <Limit name="measured-frame-rate-720x480" range="81-282" />
-            <Limit name="measured-frame-rate-1280x720" range="25-86" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="288-1003" />
-            <Limit name="measured-frame-rate-640x360" range="103-359" />
-            <Limit name="measured-frame-rate-1280x720" range="20-68" />
-            <Limit name="measured-frame-rate-1920x1080" range="14-50" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="144-502" />
-            <Limit name="measured-frame-rate-640x360" range="109-378" />
-            <Limit name="measured-frame-rate-1280x720" range="30-104" />
-        </MediaCodec>
+
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="47-104" />
             <Limit name="measured-frame-rate-720x480" range="45-156" />
             <Limit name="measured-frame-rate-1280x720" range="10-22" />
-            <Limit name="measured-frame-rate-1920x1080" range="4-8" />
+            <Limit name="measured-frame-rate-1920x1080" range="7-16" />
         </MediaCodec>
         <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="156-350" />
@@ -217,10 +175,10 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-176x144" range="301-663" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="288-1003" />
+            <Limit name="measured-frame-rate-320x180" range="73-160" />
             <Limit name="measured-frame-rate-640x360" range="103-359" />
             <Limit name="measured-frame-rate-1280x720" range="20-68" />
-            <Limit name="measured-frame-rate-1920x1080" range="5-20" />
+            <Limit name="measured-frame-rate-1920x1080" range="5-12" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x180" range="144-502" />
@@ -229,4 +187,4 @@ Only the three quirks included above are recognized at this point:
             <Limit name="measured-frame-rate-1920x1080" range="15-34" />
         </MediaCodec>
     </Decoders>
-</MediaCodecs>
+</MediaCodecs>
\ No newline at end of file
diff --git a/configs/media/media_profiles_V1_0.xml b/configs/media/media_profiles_V1_0.xml
index 424a2a6575503db547a590ac1c923bba6e73147b..a066351d59f760611566f2cf985ba987c17daaab 100644
--- a/configs/media/media_profiles_V1_0.xml
+++ b/configs/media/media_profiles_V1_0.xml
@@ -76,7 +76,7 @@
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0">
         <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -98,7 +98,7 @@
                    channels="1" />
         </EncoderProfile>
         <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -291,7 +291,7 @@
     </CamcorderProfiles>
     <CamcorderProfiles cameraId="1">
         <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -313,7 +313,7 @@
                    channels="1" />
         </EncoderProfile>
         <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -473,7 +473,7 @@
     </CamcorderProfiles>
     <CamcorderProfiles cameraId="2">
         <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -483,8 +483,19 @@
                    sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
+        <EncoderProfile quality="high" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="17000000"
+                   width="1920"
+                   height="1080"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
         <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -494,6 +505,61 @@
                    sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
+        <EncoderProfile quality="qvga" fileFormat="mp4" duration="30">
+            <Video codec="m4v"
+                   bitRate="1000000"
+                   width="320"
+                   height="240"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="cif" fileFormat="mp4" duration="30">
+            <Video codec="m4v"
+                   bitRate="1250000"
+                   width="352"
+                   height="288"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="4500000"
+                   width="640"
+                   height="480"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="720p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="9000000"
+                   width="1280"
+                   height="720"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="17000000"
+                   width="1920"
+                   height="1080"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
         <EncoderProfile quality="timelapselow" fileFormat="mp4" duration="30">
             <Video codec="h263"
                    bitRate="1000000"
@@ -505,6 +571,17 @@
                    sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
+        <EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="17000000"
+                   width="1920"
+                   height="1080"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
         <EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="30">
             <Video codec="h263"
                    bitRate="1000000"
@@ -516,6 +593,94 @@
                    sampleRate="48000"
                    channels="1" />
         </EncoderProfile>
+        <EncoderProfile quality="timelapseqvga" fileFormat="mp4" duration="30">
+            <Video codec="m4v"
+                   bitRate="1000000"
+                   width="320"
+                   height="240"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="timelapsecif" fileFormat="mp4" duration="30">
+            <Video codec="m4v"
+                   bitRate="1250000"
+                   width="352"
+                   height="288"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="4500000"
+                   width="640"
+                   height="480"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="9000000"
+                   width="1280"
+                   height="720"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="17000000"
+                   width="1920"
+                   height="1080"
+                   frameRate="30" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="highspeedlow" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="3000000"
+                   width="640"
+                   height="480"
+                   frameRate="120" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="3000000"
+                   width="640"
+                   height="480"
+                   frameRate="120" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
+        <EncoderProfile quality="highspeed480p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="3000000"
+                   width="640"
+                   height="480"
+                   frameRate="120" />
+            <Audio codec="aac"
+                   bitRate="128000"
+                   sampleRate="48000"
+                   channels="1" />
+        </EncoderProfile>
         <ImageEncoding quality="95" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />
@@ -523,7 +688,7 @@
     </CamcorderProfiles>
     <CamcorderProfiles cameraId="3">
         <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -545,7 +710,7 @@
                    channels="1" />
         </EncoderProfile>
         <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -738,7 +903,7 @@
     </CamcorderProfiles>
 	<CamcorderProfiles cameraId="4">
         <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -760,7 +925,7 @@
                    channels="1" />
         </EncoderProfile>
         <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -953,7 +1118,7 @@
     </CamcorderProfiles>
 	<CamcorderProfiles cameraId="5">
         <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -975,7 +1140,7 @@
                    channels="1" />
         </EncoderProfile>
         <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -1168,7 +1333,7 @@
     </CamcorderProfiles>
 	<CamcorderProfiles cameraId="6">
         <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -1190,7 +1355,7 @@
                    channels="1" />
         </EncoderProfile>
         <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -1383,7 +1548,7 @@
     </CamcorderProfiles>
 	<CamcorderProfiles cameraId="7">
         <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
@@ -1405,7 +1570,7 @@
                    channels="1" />
         </EncoderProfile>
         <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-            <Video codec="h263"
+            <Video codec="h264"
                    bitRate="192000"
                    width="176"
                    height="144"
diff --git a/configs/perf/power_app_cfg.xml b/configs/perf/power_app_cfg.xml
index 977c9e843b88bb91a8f011f92484098cf1daddd2..253772911eba7bde1bea0f80e0678f14b2d2790b 100644
--- a/configs/perf/power_app_cfg.xml
+++ b/configs/perf/power_app_cfg.xml
@@ -5,103 +5,139 @@ any software that is unrelated to enhancing end-user experience. -->
 <WHITELIST>
     <Package name="cn.wsds.gamemaster">
         <Activity name="Common">
-            <data cmd="PERF_RES_NET_NETD_BOOST_UID" param1="2"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_NET_NETD_BOOST_UID" param1="2"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.tencent.tmgp.sgame">
         <Activity name="Common">
-            <data cmd="PERF_RES_POWERHAL_WHITELIST_APP_LAUNCH_TIME_COLD" param1="25000"></data>
-            <data cmd="PERF_RES_FPS_FBT_FLOOR_BOUND" param1="1"></data>
-            <data cmd="PERF_RES_FPS_FBT_KMIN" param1="10"></data>
-            <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
-            <data cmd="PERF_RES_NET_NETD_BOOST_UID" param1="1"></data>
-            <data cmd="PERF_RES_NET_MD_WEAK_SIG_OPT" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_POWERHAL_WHITELIST_APP_LAUNCH_TIME_COLD" param1="25000"></data>
+                <data cmd="PERF_RES_FPS_FBT_FLOOR_BOUND" param1="1"></data>
+                <data cmd="PERF_RES_FPS_FBT_KMIN" param1="10"></data>
+                <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+                <data cmd="PERF_RES_NET_NETD_BOOST_UID" param1="1"></data>
+                <data cmd="PERF_RES_NET_MD_WEAK_SIG_OPT" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="my.beautyCamera">
         <Activity name="Common">
-            <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.tencent.mobileqq">
         <Activity name="Common">
-            <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="air.tv.douyu.android">
         <Activity name="Common">
-            <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.meitu.makeup">
         <Activity name="Common">
-            <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.netease.ko">
         <Activity name="Common">
-            <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.netease.hyxd">
         <Activity name="Common">
-            <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.maimiao.live.tv">
         <Activity name="Common">
-            <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_THERMAL_POLICY" param1="8"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.tencent.tmgp.ak">
         <Activity name="Common">
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.ak.mi">
         <Activity name="Common">
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.tencent.tmgp.cf">
         <Activity name="Common">
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.tencent.cldts">
         <Activity name="Common">
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.netease.zjz">
         <Activity name="Common">
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.tencent.tmgp.clfz">
         <Activity name="Common">
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.tencent.tmgp.pubgmhd">
         <Activity name="Common">
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
-            <data cmd="PERF_RES_NET_NETD_BOOST_UID" param1="1"></data>
-            <data cmd="PERF_RES_NET_MD_WEAK_SIG_OPT" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+                <data cmd="PERF_RES_NET_NETD_BOOST_UID" param1="1"></data>
+                <data cmd="PERF_RES_NET_MD_WEAK_SIG_OPT" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.tencent.tmgp.pubgm">
         <Activity name="Common">
-            <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_DRAM_CM_MGR" param1="1"></data>
+            </FPS>
         </Activity>
     </Package>
     <Package name="com.vectorunit.red">
         <Activity name="Common">
-            <data cmd="PERF_RES_FPS_FSTB_FPS_LOWER" param1="60"></data>
-            <data cmd="PERF_RES_FPS_FSTB_FPS_UPPER" param1="60"></data>
+            <FPS value="Common">
+                <data cmd="PERF_RES_FPS_FSTB_FPS_LOWER" param1="60"></data>
+                <data cmd="PERF_RES_FPS_FSTB_FPS_UPPER" param1="60"></data>
+            </FPS>
         </Activity>
     </Package>
-</WHITELIST>
+</WHITELIST>
\ No newline at end of file
diff --git a/configs/perf/powercontable.xml b/configs/perf/powercontable.xml
index 39118527cc6520468fe98652b268ef32bfa65c5a..f96891cfb8485d68080420e6d8d2af1579bd148e 100644
--- a/configs/perf/powercontable.xml
+++ b/configs/perf/powercontable.xml
@@ -157,6 +157,12 @@
          <MaxValue>100</MaxValue>
          <MinValue>0</MinValue>
      </CMD>
+    <CMD name="PERF_RES_FPS_FPSGO_STOP_BOOST" id="0x02004200">
+        <Entry path="/sys/kernel/fpsgo/common/stop_boost"></Entry>
+        <Compare>more</Compare>
+        <MaxValue>65535</MaxValue>
+        <MinValue>0</MinValue>
+    </CMD>
     <CMD name="PERF_RES_POWERHAL_TOUCH_BOOST_OPP" id="0x03408000">
         <Entry path="/proc/perfmgr/tchbst/user/usrtch"></Entry>
         <Compare>less</Compare>
diff --git a/configs/perf/powerscntbl.xml b/configs/perf/powerscntbl.xml
index fd81613c0fa43ea581084ae95b33fa3d2b061313..99a5567168e45e90817a2354e42cab5a41d73ab6 100644
--- a/configs/perf/powerscntbl.xml
+++ b/configs/perf/powerscntbl.xml
@@ -17,14 +17,13 @@
         <data cmd="PERF_RES_POWER_HINT_EXT_HINT_HOLD_TIME" param1="2000"></data>
     </scenario>
     <scenario powerhint="INTERACTION">
-        <data cmd="PERF_RES_CPUFREQ_MIN_CLUSTER_0" param1="1075000"></data>
-        <data cmd="PERF_RES_CPUFREQ_MIN_CLUSTER_1" param1="1162000"></data>
-        <data cmd="PERF_RES_CPUFREQ_MAX_CLUSTER_0" param1="3000000"></data>
-        <data cmd="PERF_RES_CPUFREQ_MAX_CLUSTER_1" param1="3000000"></data>
-        <data cmd="PERF_RES_SCHED_UCLAMP_MIN_TA" param1="50"></data>
+        <data cmd="PERF_RES_CPUFREQ_MIN_CLUSTER_0" param1="3000000"></data>
+        <data cmd="PERF_RES_CPUFREQ_MIN_CLUSTER_1" param1="3000000"></data>
+        <data cmd="PERF_RES_DRAM_OPP_MIN" param1="0"></data>
         <data cmd="PERF_RES_POWERHAL_TOUCH_BOOST_DURATION" param1="100000"></data>
         <data cmd="PERF_RES_POWERHAL_TOUCH_BOOST_EAS_BOOST" param1="50"></data>
-        <data cmd="PERF_RES_POWERHAL_TOUCH_BOOST_NOTIFY_FBC" param1="1"></data>
+        <data cmd="PERF_RES_CPUFREQ_CCI_FREQ" param1="1"></data>
+        <data cmd="PERF_RES_FPS_FBT_BHR_OPP" param1="15"></data>
     </scenario>
     <scenario powerhint="LAUNCH">
         <data cmd="PERF_RES_CPUFREQ_MIN_CLUSTER_0" param1="3000000"></data>
@@ -65,6 +64,7 @@
         <data cmd="PERF_RES_CPUFREQ_MIN_CLUSTER_0" param1="3000000"></data>
         <data cmd="PERF_RES_CPUFREQ_MIN_CLUSTER_1" param1="3000000"></data>
         <data cmd="PERF_RES_DRAM_OPP_MIN" param1="0"></data>
+        <data cmd="PERF_RES_POWER_HINT_INSTALL_MAX_DURATION" param1="90000"></data>
     </scenario>
     <scenario powerhint="MTKPOWER_HINT_APP_TOUCH">
         <data cmd="PERF_RES_POWERHAL_TOUCH_BOOST_NOTIFY_FBC" param1="1"></data>
diff --git a/configs/seccomp/android.hardware.media.c2@1.2-extended-seccomp-policy b/configs/seccomp/android.hardware.media.c2@1.2-extended-seccomp-policy
new file mode 100644
index 0000000000000000000000000000000000000000..05f8ff67dc6decde333a100490395e320dc26dd7
--- /dev/null
+++ b/configs/seccomp/android.hardware.media.c2@1.2-extended-seccomp-policy
@@ -0,0 +1,41 @@
+connect: 1
+fcntl64: 1
+socket: 1
+writev: 1
+clock_nanosleep: 1
+eventfd2: 1
+sched_getparam: 1
+sched_getscheduler :1
+setsockopt: 1
+bind: 1
+listen: 1
+
+# Add more for 32bits process, from android.hardware.media.c2@1.1-default-arm.policy
+mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+ftruncate64: 1
+getuid32: 1
+open: 1
+fstat64: 1
+readlink: 1
+fstatfs64: 1
+_llseek: 1
+fstatat64: 1
+ugetrlimit: 1
+# crash dump policy additions
+sigreturn: 1
+futex: 1
+#mmap2: arg2 in 0x1|0x2
+geteuid32: 1
+getgid32: 1
+getegid32: 1
+getgroups32: 1
+getpriority: 1
+mlock: 1
+munlock: 1
+fchmod: 1
+getuid: 1
+mmap: 1
+getrlimit: 1
+newfstatat: 1
+fstat: 1
+fstatfs: 1
diff --git a/configs/seccomp/android.hardware.media.c2@1.2-mediatek-seccomp-policy b/configs/seccomp/android.hardware.media.c2@1.2-mediatek-seccomp-policy
new file mode 100644
index 0000000000000000000000000000000000000000..5a85de3ab1587b6a4305c92722c28bc5d8d68cdd
--- /dev/null
+++ b/configs/seccomp/android.hardware.media.c2@1.2-mediatek-seccomp-policy
@@ -0,0 +1,91 @@
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+futex: 1
+# ioctl calls are filtered via the selinux policy.
+ioctl: 1
+sched_yield: 1
+close: 1
+dup: 1
+ppoll: 1
+mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+#mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+memfd_create: 1
+ftruncate: 1
+ftruncate64: 1
+
+# mremap: Ensure |flags| are (MREMAP_MAYMOVE | MREMAP_FIXED) TODO: Once minijail
+# parser support for '<' is in this needs to be modified to also prevent
+# |old_address| and |new_address| from touching the exception vector page, which
+# on ARM is statically loaded at 0xffff 0000. See
+# http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0211h/Babfeega.html
+# for more details.
+mremap: arg3 == 3 || arg3 == MREMAP_MAYMOVE
+munmap: 1
+prctl: 1
+getuid32: 1
+writev: 1
+sigaltstack: 1
+clone: 1
+exit: 1
+lseek: 1
+rt_sigprocmask: 1
+openat: 1
+open: 1
+fstat64: 1
+write: 1
+nanosleep: 1
+setpriority: 1
+set_tid_address: 1
+getdents64: 1
+readlinkat: 1
+readlink: 1
+read: 1
+pread64: 1
+fstatfs64: 1
+gettimeofday: 1
+faccessat: 1
+_llseek: 1
+fstatat64: 1
+ugetrlimit: 1
+exit_group: 1
+restart_syscall: 1
+rt_sigreturn: 1
+getrandom: 1
+madvise: 1
+sched_setaffinity: 1
+sched_getaffinity: 1
+sched_getparam: 1
+sched_getscheduler: 1
+recvfrom: 1
+
+# crash dump policy additions
+sigreturn: 1
+clock_gettime: 1
+futex: 1
+getpid: 1
+gettid: 1
+pipe2: 1
+recvmsg: 1
+process_vm_readv: 1
+tgkill: 1
+rt_sigaction: 1
+rt_tgsigqueueinfo: 1
+#prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41
+#mprotect: arg2 in 0x1|0x2
+#mmap2: arg2 in 0x1|0x2
+geteuid32: 1
+getgid32: 1
+getegid32: 1
+getgroups32: 1
diff --git a/configs/seccomp/configstore@1.1.policy b/configs/seccomp/configstore@1.1.policy
new file mode 100644
index 0000000000000000000000000000000000000000..a6096209945029515e6a205d6e270ea742f47823
--- /dev/null
+++ b/configs/seccomp/configstore@1.1.policy
@@ -0,0 +1,57 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+futex: 1
+# ioctl: arg1 == BINDER_WRITE_READ
+ioctl: arg1 == 0xc0306201
+# prctl: arg0 == PR_SET_NAME || arg0 == PR_SET_VMA || arg0 == PR_SET_TIMERSLACK
+# || arg0 == PR_GET_NO_NEW_PRIVS # used by crash_dump
+# prctl: arg0 == 15 || arg0 == 0x53564d41 || arg0 == 29 || arg0 == 39
+# TODO(b/68162846) reduce scope of prctl() based on arguments
+prctl: 1
+openat: 1
+mmap: 1
+mprotect: 1
+close: 1
+getuid: 1
+read: 1
+faccessat: 1
+write: 1
+fstat: 1
+clone: 1
+sched_setscheduler: 1
+munmap: 1
+lseek: 1
+sigaltstack: 1
+writev: 1
+setpriority: 1
+restart_syscall: 1
+exit: 1
+exit_group: 1
+rt_sigreturn: 1
+getrlimit: 1
+madvise: 1
+getdents64: 1
+clock_gettime: 1
+getpid: 1
+gettid: 1
+
+# used during process crash by crash_dump to dump process info
+rt_sigprocmask: 1
+rt_sigaction: 1
+# socket: arg0 == AF_LOCAL
+socket: arg0 == 1
+connect: 1
+recvmsg: 1
+rt_tgsigqueueinfo: 1
diff --git a/configs/wifi/WMT_SOC.cfg b/configs/wifi/WMT_SOC.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..a67d6801750e31c133442874c8bcdc5ed6863c82
--- /dev/null
+++ b/configs/wifi/WMT_SOC.cfg
@@ -0,0 +1,12 @@
+coex_wmt_ant_mode=1
+
+wmt_gps_lna_pin=0
+wmt_gps_lna_enable=0
+
+co_clock_flag=0
+
+bt_tssi_from_wifi=3
+bt_tssi_target=3776
+
+
+
diff --git a/configs/wifi/p2p_supplicant_overlay.conf b/configs/wifi/p2p_supplicant_overlay.conf
index 8728ee1c521dbe647be3c0f981decd7e6296f1d3..230880f67ce08a1af08bff30f193abdf17872417 100644
--- a/configs/wifi/p2p_supplicant_overlay.conf
+++ b/configs/wifi/p2p_supplicant_overlay.conf
@@ -3,3 +3,4 @@ driver_param=use_p2p_group_interface=1
 bss_expiration_scan_count=1
 wowlan_triggers=disconnect
 p2p_search_delay=50
+p2p_go_he=1
diff --git a/configs/wifi/wpa_supplicant.conf b/configs/wifi/wpa_supplicant.conf
index 6ce4777f01258e3979a2dac65c0f3f5c56c7668a..8553f02b78b0753651f09c2bd7fba6231263b615 100644
--- a/configs/wifi/wpa_supplicant.conf
+++ b/configs/wifi/wpa_supplicant.conf
@@ -12,3 +12,5 @@ p2p_no_group_iface=1
 driver_param=use_p2p_group_interface=1
 hs20=1
 pmf=1
+wowlan_disconnect_on_deinit=1
+sae_pwe=2
diff --git a/extract-files.sh b/extract-files.sh
index 788ecba953b6560a8df9a31c4dba5cb51b8d18d5..12c53a462199e48db139d91fdb71ae2398af59ab 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -58,36 +58,6 @@ if [ -z "${SRC}" ]; then
     SRC="adb"
 fi
 
-function blob_fixup {
-    case "${1}" in
-        lib/libsink.so)
-            "${PATCHELF}" --add-needed "libshim_vtservice.so" "${2}"
-            ;;
-        lib/libshowlogo.so)
-            "${PATCHELF}" --add-needed "libshim_showlogo.so" "${2}"
-            ;;
-        vendor/lib/hw/audio.primary.mt6765.so)
-            "${PATCHELF}" --replace-needed "libmedia_helper.so" "libmedia_helper-v30.so" "${2}"
-            ;;
-        vendor/lib/libmtkcam_stdutils.so)
-            "${PATCHELF}" --replace-needed "libutils.so" "libutils-v30.so" "${2}"
-            ;;
-        vendor/lib/libudf.so)
-            "${PATCHELF}" --replace-needed "libunwindstack.so" "libunwindstack-v30.so" "${2}"
-            ;;
-        vendor/lib64/hw/audio.primary.mt6765.so)
-            "${PATCHELF}" --replace-needed "libmedia_helper.so" "libmedia_helper-v30.so" "${2}"
-            ;;
-        vendor/lib64/libmtkcam_stdutils.so)
-            "${PATCHELF}" --replace-needed "libutils.so" "libutils-v30.so" "${2}"
-            ;;
-        vendor/lib64/libudf.so)
-            "${PATCHELF}" --replace-needed "libunwindstack.so" "libunwindstack-v30.so" "${2}"
-            ;;
-    esac
-}
-
-
 if [ -z "${ONLY_TARGET}" ]; then
     # Initialize the helper for common device
     setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
diff --git a/manifest.xml b/manifest.xml
index 9ccc58739b62345e0b081eb4fe84d3621ee5b514..d69c13ff70a642f2f7128630b4812bca37718114 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,33 +1,33 @@
-<manifest version="2.0" type="device" target-level="4">
+<manifest version="4.0" type="device" target-level="4">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
-        <version>6.0</version>
+        <version>7.0</version>
         <interface>
             <name>IDevicesFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@6.0::IDevicesFactory/default</fqname>
+        <fqname>@7.0::IDevicesFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
         <transport>hwbinder</transport>
-        <version>6.0</version>
+        <version>7.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@6.0::IEffectsFactory/default</fqname>
+        <fqname>@7.0::IEffectsFactory/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IBluetoothHci</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.0::IBluetoothHci/default</fqname>
+        <fqname>@1.1::IBluetoothHci/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth.audio</name>
@@ -59,18 +59,6 @@
         </interface>
         <fqname>@1.1::ISurfaceFlingerConfigs/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.gnss</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <version>2.1</version>
-        <interface>
-            <name>IGnss</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.1::IGnss/default</fqname>
-        <fqname>@2.1::IGnss/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.graphics.allocator</name>
         <transport>hwbinder</transport>
@@ -166,24 +154,24 @@
         <fqname>@1.2::IRadio/slot2</fqname>
         <fqname>@1.2::ISap/slot1</fqname>
         <fqname>@1.2::ISap/slot2</fqname>
-        <fqname>@1.5::IRadio/em1</fqname>
-        <fqname>@1.5::IRadio/em2</fqname>
-        <fqname>@1.5::IRadio/imsAospSlot1</fqname>
-        <fqname>@1.5::IRadio/imsAospSlot2</fqname>
-        <fqname>@1.5::IRadio/se1</fqname>
-        <fqname>@1.5::IRadio/se2</fqname>
-        <fqname>@1.5::IRadio/slot1</fqname>
-        <fqname>@1.5::IRadio/slot2</fqname>
+        <fqname>@1.6::IRadio/em1</fqname>
+        <fqname>@1.6::IRadio/em2</fqname>
+        <fqname>@1.6::IRadio/imsAospSlot1</fqname>
+        <fqname>@1.6::IRadio/imsAospSlot2</fqname>
+        <fqname>@1.6::IRadio/se1</fqname>
+        <fqname>@1.6::IRadio/se2</fqname>
+        <fqname>@1.6::IRadio/slot1</fqname>
+        <fqname>@1.6::IRadio/slot2</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.radio.config</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.3</version>
         <interface>
             <name>IRadioConfig</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.1::IRadioConfig/default</fqname>
+        <fqname>@1.3::IRadioConfig/default</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.sensors</name>
@@ -196,46 +184,46 @@
         <fqname>@2.0::ISensors/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.thermal</name>
+        <name>android.hardware.tetheroffload.config</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
-        <version>2.0</version>
         <interface>
-            <name>IThermal</name>
+            <name>IOffloadConfig</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.0::IThermal/default</fqname>
-        <fqname>@2.0::IThermal/default</fqname>
+        <fqname>@1.0::IOffloadConfig/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.usb</name>
+        <name>android.hardware.tetheroffload.control</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
         <interface>
-            <name>IUsb</name>
+            <name>IOffloadControl</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.1::IUsb/default</fqname>
+        <fqname>@1.1::IOffloadControl/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.usb.gadget</name>
+        <name>android.hardware.thermal</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.0</version>
+        <version>2.0</version>
         <interface>
-            <name>IUsbGadget</name>
+            <name>IThermal</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.1::IUsbGadget/default</fqname>
+        <fqname>@1.0::IThermal/default</fqname>
+        <fqname>@2.0::IThermal/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.wifi.supplicant</name>
+        <name>vendor.mediatek.hardware.apmonitor</name>
         <transport>hwbinder</transport>
-        <version>1.3</version>
+        <version>2.0</version>
         <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        <fqname>@1.3::ISupplicant/default</fqname>
+            <name>IApmService</name>
+            <instance>apm_hidl_service</instance>
         </interface>
+        <fqname>@2.0::IApmService/apm_hidl_service</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.mediatek.hardware.atci</name>
@@ -250,12 +238,22 @@
     <hal format="hidl">
         <name>vendor.mediatek.hardware.bluetooth.audio</name>
         <transport>hwbinder</transport>
-        <version>2.1</version>
+        <version>2.2</version>
         <interface>
             <name>IBluetoothAudioProvidersFactory</name>
             <instance>default</instance>
         </interface>
-        <fqname>@2.1::IBluetoothAudioProvidersFactory/default</fqname>
+        <fqname>@2.2::IBluetoothAudioProvidersFactory/default</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.mediatek.hardware.camera.atms</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IATMs</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@1.0::IATMs/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.mediatek.hardware.camera.bgservice</name>
@@ -268,83 +266,69 @@
         <fqname>@1.1::IBGService/internal/0</fqname>
     </hal>
     <hal format="hidl">
-        <name>vendor.mediatek.hardware.keymaster_attestation</name>
+        <name>vendor.mediatek.hardware.camera.isphal</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
         <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
+            <name>IISPModule</name>
+            <instance>internal/0</instance>
         </interface>
-        <fqname>@1.1::IKeymasterDevice/default</fqname>
+        <fqname>@1.1::IISPModule/internal/0</fqname>
     </hal>
     <hal format="hidl">
-        <name>vendor.mediatek.hardware.lbs</name>
+        <name>vendor.mediatek.hardware.composer_ext</name>
         <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
-            <name>ILbs</name>
-            <instance>AgpsDebugInterface</instance>
-            <instance>AgpsInterface</instance>
-            <instance>mtk_agps2framework</instance>
-            <instance>mtk_debugService2mnld</instance>
-            <instance>mtk_framework2agps</instance>
-            <instance>mtk_lbs_log_v2s</instance>
-            <instance>mtk_lppe_socket_agps</instance>
-            <instance>mtk_lppe_socket_bt</instance>
-            <instance>mtk_lppe_socket_ipaddr</instance>
-            <instance>mtk_lppe_socket_lbs</instance>
-            <instance>mtk_lppe_socket_network</instance>
-            <instance>mtk_lppe_socket_sensor</instance>
-            <instance>mtk_lppe_socket_wlan</instance>
-            <instance>mtk_meta2mnld</instance>
-            <instance>mtk_mnld2debugService</instance>
-            <instance>mtk_mnld2mtklogger</instance>
-            <instance>mtk_mnld2nlputils</instance>
-            <instance>mtk_mtklogger2mnld</instance>
-        </interface>
-        <fqname>@1.0::ILbs/AgpsDebugInterface</fqname>
-        <fqname>@1.0::ILbs/AgpsInterface</fqname>
-        <fqname>@1.0::ILbs/mtk_agps2framework</fqname>
-        <fqname>@1.0::ILbs/mtk_debugService2mnld</fqname>
-        <fqname>@1.0::ILbs/mtk_framework2agps</fqname>
-        <fqname>@1.0::ILbs/mtk_lbs_log_v2s</fqname>
-        <fqname>@1.0::ILbs/mtk_lppe_socket_agps</fqname>
-        <fqname>@1.0::ILbs/mtk_lppe_socket_bt</fqname>
-        <fqname>@1.0::ILbs/mtk_lppe_socket_ipaddr</fqname>
-        <fqname>@1.0::ILbs/mtk_lppe_socket_lbs</fqname>
-        <fqname>@1.0::ILbs/mtk_lppe_socket_network</fqname>
-        <fqname>@1.0::ILbs/mtk_lppe_socket_sensor</fqname>
-        <fqname>@1.0::ILbs/mtk_lppe_socket_wlan</fqname>
-        <fqname>@1.0::ILbs/mtk_meta2mnld</fqname>
-        <fqname>@1.0::ILbs/mtk_mnld2debugService</fqname>
-        <fqname>@1.0::ILbs/mtk_mnld2mtklogger</fqname>
-        <fqname>@1.0::ILbs/mtk_mnld2nlputils</fqname>
-        <fqname>@1.0::ILbs/mtk_mtklogger2mnld</fqname>
+            <name>IComposerExt</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@1.0::IComposerExt/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>vendor.mediatek.hardware.mms</name>
+        <name>vendor.mediatek.hardware.dmc</name>
         <transport>hwbinder</transport>
-        <version>1.5</version>
+        <version>1.2</version>
         <interface>
-            <name>IMms</name>
+            <name>IDmcService</name>
+            <instance>dmc_hidl_service</instance>
+        </interface>
+        <fqname>@1.2::IDmcService/dmc_hidl_service</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.mediatek.hardware.keymaster_attestation</name>
+        <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IKeymasterDevice</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.5::IMms/default</fqname>
+        <fqname>@1.1::IKeymasterDevice/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>vendor.mediatek.hardware.mtkcodecservice</name>
+        <name>vendor.mediatek.hardware.mmagent</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
         <interface>
-            <name>IMtkCodecService</name>
+            <name>IMMAgent</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.1::IMtkCodecService/default</fqname>
+        <fqname>@1.1::IMMAgent/default</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.mediatek.hardware.mms</name>
+        <transport>hwbinder</transport>
+        <version>1.6</version>
+        <interface>
+            <name>IMms</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@1.6::IMms/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.mediatek.hardware.mtkpower</name>
         <transport>hwbinder</transport>
-        <version>1.1</version>
+        <version>1.2</version>
         <interface>
             <name>IMtkPerf</name>
             <instance>default</instance>
@@ -353,13 +337,13 @@
             <name>IMtkPower</name>
             <instance>default</instance>
         </interface>
-        <fqname>@1.1::IMtkPerf/default</fqname>
-        <fqname>@1.1::IMtkPower/default</fqname>
+        <fqname>@1.2::IMtkPerf/default</fqname>
+        <fqname>@1.2::IMtkPower/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.mediatek.hardware.mtkradioex</name>
         <transport>hwbinder</transport>
-        <version>2.2</version>
+        <version>3.0</version>
         <interface>
             <name>IMtkRadioEx</name>
             <instance>imsSlot1</instance>
@@ -372,6 +356,8 @@
             <instance>mtkEm2</instance>
             <instance>mtkRcs1</instance>
             <instance>mtkRcs2</instance>
+            <instance>mtkRsu1</instance>
+            <instance>mtkRsu2</instance>
             <instance>mtkSe1</instance>
             <instance>mtkSe2</instance>
             <instance>mtkSlot1</instance>
@@ -379,22 +365,24 @@
             <instance>mtkSmartRatSwitch1</instance>
             <instance>mtkSmartRatSwitch2</instance>
         </interface>
-        <fqname>@2.2::IMtkRadioEx/imsSlot1</fqname>
-        <fqname>@2.2::IMtkRadioEx/imsSlot2</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkAssist1</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkAssist2</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkCap1</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkCap2</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkEm1</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkEm2</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkRcs1</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkRcs2</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkSe1</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkSe2</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkSlot1</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkSlot2</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkSmartRatSwitch1</fqname>
-        <fqname>@2.2::IMtkRadioEx/mtkSmartRatSwitch2</fqname>
+        <fqname>@3.0::IMtkRadioEx/imsSlot1</fqname>
+        <fqname>@3.0::IMtkRadioEx/imsSlot2</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkAssist1</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkAssist2</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkCap1</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkCap2</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkEm1</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkEm2</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkRcs1</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkRcs2</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkRsu1</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkRsu2</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkSe1</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkSe2</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkSlot1</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkSlot2</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkSmartRatSwitch1</fqname>
+        <fqname>@3.0::IMtkRadioEx/mtkSmartRatSwitch2</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.mediatek.hardware.netdagent</name>
@@ -419,12 +407,12 @@
     <hal format="hidl">
         <name>vendor.mediatek.hardware.pq</name>
         <transport>hwbinder</transport>
-        <version>2.6</version>
+        <version>2.14</version>
         <interface>
             <name>IPictureQuality</name>
             <instance>default</instance>
         </interface>
-        <fqname>@2.6::IPictureQuality/default</fqname>
+        <fqname>@2.14::IPictureQuality/default</fqname>
     </hal>
     <hal format="hidl">
         <name>vendor.mediatek.hardware.videotelephony</name>
@@ -436,16 +424,6 @@
         </interface>
         <fqname>@1.0::IVideoTelephony/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>vendor.mediatek.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISupplicant</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::ISupplicant/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>vendor.microtrust.hardware.thh</name>
         <transport>hwbinder</transport>
diff --git a/mt6765.mk b/mt6765.mk
index 7860b4f983a8576d6796643bca3ba272838484b0..959cd71ca52b3fc86bc2a47a9ed0d22166c59808 100644
--- a/mt6765.mk
+++ b/mt6765.mk
@@ -40,18 +40,17 @@ TARGET_SCREEN_WIDTH := 720
 # Audio
 PRODUCT_PACKAGES += \
     android.hardware.audio.service \
+    android.hardware.audio@7.0-impl \
     android.hardware.audio@6.0-impl \
-    android.hardware.audio.common@6.0-util \
+    android.hardware.audio.effect@7.0-impl \
     android.hardware.audio.effect@6.0-impl \
     android.hardware.audio@6.0.vendor \
-    audio.a2dp.default \
     audio.bluetooth.default \
+    android.hardware.audio.common-util.vendor \
     audio.r_submix.default \
     audio.usb.default \
     audio_policy.stub \
-    audio.bluetooth.default \
-    audio.r_submix.default \
-    audio_policy.stub \
+    libalsautils \
     libaudiopreprocessing \
     libaudiofoundation.vendor \
     libbluetooth_audio_session \
@@ -63,11 +62,13 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/audio/audio_em.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_em.xml \
     $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     $(LOCAL_PATH)/configs/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
-    $(LOCAL_PATH)/configs/audio/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml
+    $(LOCAL_PATH)/configs/audio/bluetooth_offload_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_offload_audio_policy_configuration.xml \
+    $(LOCAL_PATH)/configs/audio/usb_audio_accessory_only_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_accessory_only_policy_configuration.xml
 
 PRODUCT_COPY_FILES += \
-    frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
-    frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
+    frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+    frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
+    frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml
@@ -76,7 +77,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.1.vendor \
     android.hardware.bluetooth.audio@2.1-impl \
-    libbluetooth_audio_session
 
 # Biometrics
 PRODUCT_PACKAGES += \
@@ -84,16 +84,14 @@ PRODUCT_PACKAGES += \
 
 # Camera
 PRODUCT_PACKAGES += \
-    Snap
-
-PRODUCT_PACKAGES += \
+    android.hardware.camera.common@1.0.vendor \
+    android.hardware.camera.device@1.0.vendor \
     android.hardware.camera.device@3.6.vendor \
     android.hardware.camera.provider@2.6.vendor
 
 # Charger
 PRODUCT_PACKAGES += \
-    libsuspend \
-    libshim_showlogo
+    libsuspend
 
 # Configstore
 PRODUCT_PACKAGES += \
@@ -101,6 +99,7 @@ PRODUCT_PACKAGES += \
 
 # Display
 PRODUCT_PACKAGES += \
+    android.hardware.graphics.allocator@4.0.vendor \
     android.hardware.graphics.composer@2.1-service \
     android.hardware.graphics.composer@2.1-resources \
     android.hardware.graphics.composer@2.1-resources.vendor \
@@ -150,6 +149,13 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/keylayouts/mtk-kpd.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/mtk-kpd.kl
 
 # Media
+PRODUCT_PACKAGES += \
+    libcodec2_hidl@1.2.vendor \
+    libavservices_minijail_vendor \
+    libstagefright_softomx_plugin.vendor \
+    libsfplugin_ccodec_utils.vendor \
+    libcodec2_soft_common.vendor
+
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
     $(LOCAL_PATH)/configs/media/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
@@ -163,6 +169,8 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml
 
 PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/seccomp/android.hardware.media.c2@1.2-extended-seccomp-policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy \
+    $(LOCAL_PATH)/configs/seccomp/android.hardware.media.c2@1.2-mediatek-seccomp-policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy \
     $(LOCAL_PATH)/configs/seccomp/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
     $(LOCAL_PATH)/configs/seccomp/mediaextractor.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaextractor.policy \
     $(LOCAL_PATH)/configs/seccomp/mediaswcodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediaswcodec.policy
@@ -171,6 +179,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0.vendor
 
+# Neural networks
+PRODUCT_PACKAGES += \
+    android.hardware.neuralnetworks@1.3.vendor
+
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
@@ -236,15 +248,12 @@ PRODUCT_COPY_FILES += \
 
 # Radio
 PRODUCT_PACKAGES += \
-    android.hardware.radio.config@1.2.vendor \
-    android.hardware.radio@1.5.vendor
+    android.hardware.radio.config@1.3.vendor \
+    android.hardware.radio@1.6.vendor
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/permissions/privapp-permissions-ims.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-ims.xml
 
-PRODUCT_PACKAGES += \
-    libshim_vtservice
-
 SKIP_BOOT_JARS_CHECK := true
 
 PRODUCT_BOOT_JARS += \
@@ -259,7 +268,9 @@ PRODUCT_BOOT_JARS += \
 # Rootdir
 PRODUCT_PACKAGES += \
     init.ago.rc \
+    init.cgroup.rc \
     init.connectivity.rc \
+    init.connectivity.common.rc \
     init.modem.rc \
     init.mt6762.rc \
     init.mt6765.rc \
@@ -291,7 +302,7 @@ PRODUCT_PACKAGES += \
 
 # USB
 PRODUCT_PACKAGES += \
-    android.hardware.usb@1.1.vendor \
+    android.hardware.usb@1.3.vendor \
     android.hardware.usb.gadget@1.1.vendor
 
 # NFC
@@ -313,21 +324,13 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.vibrator-V1-ndk_platform.vendor
 
-# VNDK
-PRODUCT_COPY_FILES += \
-    prebuilts/vndk/v30/arm64/arch-arm-armv8-a/shared/vndk-core/libmedia_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmedia_helper-v30.so \
-    prebuilts/vndk/v30/arm64/arch-arm-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libutils-v30.so \
-    prebuilts/vndk/v30/arm64/arch-arm-armv8-a/shared/vndk-sp/libunwindstack.so:$(TARGET_COPY_OUT_VENDOR)/lib/libunwindstack-v30.so \
-    prebuilts/vndk/v30/arm64/arch-arm64-armv8-a/shared/vndk-core/libmedia_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmedia_helper-v30.so \
-    prebuilts/vndk/v30/arm64/arch-arm64-armv8-a/shared/vndk-sp/libutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libutils-v30.so \
-    prebuilts/vndk/v30/arm64/arch-arm64-armv8-a/shared/vndk-sp/libunwindstack.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libunwindstack-v30.so
-
 # WiFi
 PRODUCT_PACKAGES += \
     android.hardware.wifi@1.5.vendor \
     android.hardware.wifi.hostapd@1.3.vendor \
-    android.hardware.wifi.supplicant@1.3.vendor \
-    android.hardware.wifi@1.0-service-lazy
+    android.hardware.wifi.supplicant@1.4.vendor \
+    android.hardware.tetheroffload.config@1.0.vendor \
+    android.hardware.tetheroffload.control@1.1.vendor
 
 PRODUCT_PACKAGES += \
     TetheringConfigOverlay \
@@ -336,7 +339,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
     $(LOCAL_PATH)/configs/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
-    $(LOCAL_PATH)/configs/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf
+    $(LOCAL_PATH)/configs/wifi/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \
+    $(LOCAL_PATH)/configs/wifi/WMT_SOC.cfg:$(TARGET_COPY_OUT_VENDOR)/firmware/WMT_SOC.cfg
 
 # Inherit the proprietary files
 $(call inherit-product, vendor/teracube/mt6765-common/mt6765-common-vendor.mk)
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b64dc38ad2f38f96df8ac7c12ece53dd3fde3274..e7d98cc56cb9e411c258fbb86fed75b553f6a542 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,10 +1,5 @@
-# Teracube Build ID: 11.0.7-thrive+d5a7de0.emerald.user
-# Unpinned blobs from full_yk673v6_lwg62_64-user 11 RP1A.200720.011 p1k61v164bspP13 release-keys
-
-# AEE
-vendor/lib/libladder.so
-vendor/lib64/libaedv.so
-vendor/lib64/libladder.so
+# Teracube Build ID: 12.0.0+021f22f.emerald.user
+# Unpinned blobs from full_emernia-user 12 SP1A.210812.016 s0rc0emerniabsp release-keys
 
 # AAL
 vendor/lib/libaal_cust.so
@@ -16,17 +11,32 @@ vendor/lib64/libaal_key.so
 vendor/lib64/libaal_mtk.so
 vendor/lib64/libaalservice.so
 
+# AEE
+vendor/lib/libladder.so
+vendor/lib64/libaedv.so
+vendor/lib64/libladder.so
+
+# APU
+vendor/lib/libapu_mdw.so
+vendor/lib/libapusys.so
+vendor/lib/libapusys_edma.so
+vendor/lib64/libapu_mdw.so
+vendor/lib64/libapusys.so
+vendor/lib64/libapusys_edma.so
+
 # Audio
 vendor/bin/atcid
 vendor/bin/audiocmdservice_atci
+vendor/bin/mt6660_calibration
+vendor/bin/rt5512_calibration
 vendor/etc/init/atcid.rc
 vendor/etc/init/audiocmdservice_atci.rc
 vendor/lib/hw/audio.primary.mt6765.so
 vendor/lib/hw/audio.r_submix.mt6765.so
-vendor/lib/hw/audio.usb.mt6765.so
 vendor/lib/libMtkSpeechEnh.so
 vendor/lib/lib_iir.so
 vendor/lib/lib_speech_enh.so
+vendor/lib/libadpcmdec_mtk.so
 vendor/lib/libaudio_param_parser-vnd.so
 vendor/lib/libaudiocompensationfilter_vendor.so
 vendor/lib/libaudiocompensationfilterc.so
@@ -42,14 +52,15 @@ vendor/lib/libaurisysdemo.so
 vendor/lib/libbessound_hd_mtk_vendor.so
 vendor/lib/libblisrc32_vendor.so
 vendor/lib/libbwc.so
+vendor/lib/librt_extamp_intf.so
 vendor/lib/libspeech_enh_lib.so
 vendor/lib/libspeechparser_vendor.so
-vendor/lib/libwebrtc_audio_preprocessing.so
 vendor/lib/vendor.mediatek.hardware.audio@6.1.so
+vendor/lib/vendor.mediatek.hardware.audio@7.1.so
 vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.1.so
+vendor/lib/vendor.mediatek.hardware.bluetooth.audio@2.2.so
 vendor/lib64/hw/audio.primary.mt6765.so
 vendor/lib64/hw/audio.r_submix.mt6765.so
-vendor/lib64/hw/audio.usb.mt6765.so
 vendor/lib64/libMtkSpeechEnh.so
 vendor/lib64/lib_bsscore.so
 vendor/lib64/lib_iir.so
@@ -70,12 +81,14 @@ vendor/lib64/libbessound_hd_mtk_vendor.so
 vendor/lib64/libblisrc32_vendor.so
 vendor/lib64/libbwc.so
 vendor/lib64/libmtktinyxml.so
+vendor/lib64/librt_extamp_intf.so
 vendor/lib64/libspeech_enh_lib.so
 vendor/lib64/libspeechparser_vendor.so
-vendor/lib64/libwebrtc_audio_preprocessing.so
 vendor/lib64/vendor.mediatek.hardware.atci@1.0.so
 vendor/lib64/vendor.mediatek.hardware.audio@6.1.so
+vendor/lib64/vendor.mediatek.hardware.audio@7.1.so
 vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so
+vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.2.so
 
 # Audio (FX modules)
 vendor/lib/soundfx/libaudiopreprocessing_mtk.so
@@ -83,6 +96,7 @@ vendor/lib64/soundfx/libaudiopreprocessing_mtk.so
 
 # Audio Configs
 vendor/etc/audio_param/AudioParamOptions.xml
+vendor/etc/audio_param/AudioParamOptions_vext.xml
 vendor/etc/audio_param/BtInfo_AudioParam.xml
 vendor/etc/audio_param/BtInfo_ParamUnitDesc.xml
 vendor/etc/audio_param/HpImpedance_AudioParam.xml
@@ -121,6 +135,8 @@ vendor/etc/audio_param/RingbackVolUI_AudioParam.xml
 vendor/etc/audio_param/RingbackVolUI_ParamUnitDesc.xml
 vendor/etc/audio_param/RingbackVol_AudioParam.xml
 vendor/etc/audio_param/RingbackVol_ParamUnitDesc.xml
+vendor/etc/audio_param/SmartPa_AudioParam.xml
+vendor/etc/audio_param/SmartPa_ParamUnitDesc.xml
 vendor/etc/audio_param/SoundEnhancement_AudioParam.xml
 vendor/etc/audio_param/SoundEnhancement_ParamUnitDesc.xml
 vendor/etc/audio_param/SpeechDMNR_AudioParam.xml
@@ -146,10 +162,10 @@ vendor/etc/audio_param/USBCall_AudioParam.xml
 vendor/etc/audio_param/USBCall_ParamUnitDesc.xml
 vendor/etc/audio_param/USBDevice_AudioParam.xml
 vendor/etc/audio_param/USBDevice_ParamUnitDesc.xml
+vendor/etc/audio_param/Ultrasound_AudioParam.xml
+vendor/etc/audio_param/Ultrasound_ParamUnitDesc.xml
 vendor/etc/audio_param/UplinkConfiguration_AudioParam.xml
 vendor/etc/audio_param/UplinkConfiguration_ParamUnitDesc.xml
-vendor/etc/audio_param/VOW_AudioParam.xml
-vendor/etc/audio_param/VOW_ParamUnitDesc.xml
 vendor/etc/audio_param/VoIPDMNR_AudioParam.xml
 vendor/etc/audio_param/VoIPDMNR_ParamUnitDesc.xml
 vendor/etc/audio_param/VoIPGeneral_AudioParam.xml
@@ -174,8 +190,14 @@ vendor/etc/audio_param/VoIPv2_ParamTreeView.xml
 vendor/etc/audio_param/VoIPv2_ParamUnitDesc.xml
 vendor/etc/audio_param/VoWDspAec_AudioParam.xml
 vendor/etc/audio_param/VoWDspAec_ParamUnitDesc.xml
+vendor/etc/audio_param/VoWEngineFeature_AudioParam.xml
+vendor/etc/audio_param/VoWEngineFeature_ParamUnitDesc.xml
 vendor/etc/audio_param/VoWHwVad_AudioParam.xml
 vendor/etc/audio_param/VoWHwVad_ParamUnitDesc.xml
+vendor/etc/audio_param/VoWMicSetting_AudioParam.xml
+vendor/etc/audio_param/VoWMicSetting_ParamUnitDesc.xml
+vendor/etc/audio_param/VoWVoiceCommand_AudioParam.xml
+vendor/etc/audio_param/VoWVoiceCommand_ParamUnitDesc.xml
 vendor/etc/audio_param/VolumeGainMapUL_AudioParam.xml
 vendor/etc/audio_param/VolumeGainMapUL_ParamUnitDesc.xml
 vendor/etc/audio_param/VolumeGainMap_AudioParam.xml
@@ -183,13 +205,12 @@ vendor/etc/audio_param/VolumeGainMap_ParamUnitDesc.xml
 vendor/etc/audio_param/Volume_AudioParam.xml
 vendor/etc/audio_param/Volume_ParamUnitDesc.xml
 vendor/etc/aurisys_config.xml
-vendor/etc/aurisys_param/Speech_AudioParam.xml
 
 # Bluetooth
+vendor/bin/hw/android.hardware.bluetooth@1.1-service-mediatek
 vendor/bin/autobt
 vendor/bin/bip
-vendor/bin/hw/android.hardware.bluetooth@1.0-service-mediatek
-vendor/etc/init/android.hardware.bluetooth@1.0-service-mediatek.rc
+vendor/etc/init/android.hardware.bluetooth@1.1-service-mediatek.rc
 vendor/etc/init/init.bip.rc
 vendor/etc/init/init.bt_drv.rc
 vendor/lib/libbluetooth_hw_test.so
@@ -198,7 +219,7 @@ vendor/lib/libbluetooth_mtk_pure.so
 vendor/lib/libbluetooth_relayer.so
 vendor/lib/libbluetoothem_mtk.so
 vendor/lib/libbt-vendor.so
-vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-mediatek.so
+vendor/lib64/hw/android.hardware.bluetooth@1.1-impl-mediatek.so
 vendor/lib64/libbluetooth_hw_test.so
 vendor/lib64/libbluetooth_mtk.so
 vendor/lib64/libbluetooth_mtk_pure.so
@@ -208,36 +229,45 @@ vendor/lib64/libbt-vendor.so
 
 # Bluetooth (A2DP)
 vendor/lib/hw/vendor.mediatek.hardware.bluetooth.audio@2.1-impl.so
+vendor/lib/hw/vendor.mediatek.hardware.bluetooth.audio@2.2-impl.so
 vendor/lib/libbluetooth_audio_session_mediatek.so
 vendor/lib64/hw/vendor.mediatek.hardware.bluetooth.audio@2.1-impl.so
+vendor/lib64/hw/vendor.mediatek.hardware.bluetooth.audio@2.2-impl.so
 vendor/lib64/libbluetooth_audio_session_mediatek.so
 
 # Camera
 vendor/bin/hw/camerahalserver
-vendor/bin/libccu_hi846_2lane_mipi_raw.dm
-vendor/bin/libccu_hi846_2lane_mipi_raw.pm
-vendor/bin/libccu_hi846_mipi_raw.dm
-vendor/bin/libccu_hi846_mipi_raw.pm
-vendor/bin/libccu_s5k3l6_mipi_raw.dm
-vendor/bin/libccu_s5k3l6_mipi_raw.pm
 vendor/etc/init/camerahalserver.rc
+vendor/lib/hw/vendor.mediatek.hardware.camera.atms@1.0-impl.so
+vendor/lib/hw/vendor.mediatek.hardware.camera.bgservice@1.1-impl.so
+vendor/lib/hi846_2lane_mipi_raw_tuning.so
 vendor/lib/hi846_2lane_mipi_raw_tuning.so
 vendor/lib/hi846_mipi_raw_tuning.so
-vendor/lib/hw/vendor.mediatek.hardware.camera.bgservice@1.1-impl.so
+vendor/lib/hi846_mipi_raw_tuning.so
+vendor/lib/libasn1c_core.so
+vendor/lib/libasn1c_mapi.so
+vendor/lib/libasn1c_mdmi.so
+vendor/lib/libmtkcam.atmseventmgr.so
 vendor/lib/libmtkcam.eventcallback.so
 vendor/lib/libmtkcam_debugutils.so
 vendor/lib/libmtkcam_stdutils.so
 vendor/lib/libmtkcam_ulog.so
+vendor/lib/libverno.so
 vendor/lib/s5k3l6_mipi_raw_tuning.so
+vendor/lib/vendor.mediatek.hardware.camera.atms@1.0.so
 vendor/lib/vendor.mediatek.hardware.camera.bgservice@1.0.so
 vendor/lib/vendor.mediatek.hardware.camera.bgservice@1.1.so
+vendor/lib64/hw/android.hardware.camera.provider@2.6-impl-mediatek.so
+vendor/lib64/hw/vendor.mediatek.hardware.camera.atms@1.0-impl.so
+vendor/lib64/hw/vendor.mediatek.hardware.camera.bgservice@1.1-impl.so
+vendor/lib64/hw/vendor.mediatek.hardware.camera.isphal@1.0-impl.so
+vendor/lib64/hw/vendor.mediatek.hardware.camera.isphal@1.1-impl.so
+vendor/lib64/hw/vendor.mediatek.hardware.camera.lomoeffect@1.0-impl.so
+vendor/lib64/mtkcam/libmtkcam_streaminfo_plugin-p1stt.so
 vendor/lib64/hi846_2lane_mipi_raw_IdxMgr.so
 vendor/lib64/hi846_2lane_mipi_raw_tuning.so
 vendor/lib64/hi846_mipi_raw_IdxMgr.so
 vendor/lib64/hi846_mipi_raw_tuning.so
-vendor/lib64/hw/android.hardware.camera.provider@2.6-impl-mediatek.so
-vendor/lib64/hw/vendor.mediatek.hardware.camera.bgservice@1.1-impl.so
-vendor/lib64/hw/vendor.mediatek.hardware.camera.lomoeffect@1.0-impl.so
 vendor/lib64/lib3a.ae.core.so
 vendor/lib64/lib3a.ae.so
 vendor/lib64/lib3a.af.core.so
@@ -250,6 +280,7 @@ vendor/lib64/lib3a.flash.so
 vendor/lib64/lib3a.gma.so
 vendor/lib64/lib3a.lce.so
 vendor/lib64/lib3a.log.so
+vendor/lib64/libSQLiteModule_VER_ALL.so
 vendor/lib64/libSonyIMX230PdafLibrary.so
 vendor/lib64/libSonyIMX230PdafLibraryWrapper.so
 vendor/lib64/libSonyIMX338PdafLibrary.so
@@ -259,6 +290,10 @@ vendor/lib64/libSonyIMX386PdafLibraryWrapper.so
 vendor/lib64/libSonyIMX519PdafLibrary.so
 vendor/lib64/libSonyIMX519PdafLibraryWrapper.so
 vendor/lib64/libabfadp.so
+vendor/lib64/libasn1c_core.so
+vendor/lib64/libasn1c_mapi.so
+vendor/lib64/libasn1c_mdmi.so
+vendor/lib64/libcam.chdr.so
 vendor/lib64/libcam.feature_utils.so
 vendor/lib64/libcam.hal3a.cctsvr.so
 vendor/lib64/libcam.hal3a.log.so
@@ -270,10 +305,10 @@ vendor/lib64/libcam.halisp.so
 vendor/lib64/libcam.iopipe.so
 vendor/lib64/libcam.lcs.so
 vendor/lib64/libcam.pdtblgen.so
+vendor/lib64/libcam.utils.sensorprovider.so
 vendor/lib64/libcam.vhdr.so
 vendor/lib64/libcamalgo.3dnr.so
 vendor/lib64/libcamalgo.abf.so
-vendor/lib64/libcamalgo.asd.so
 vendor/lib64/libcamalgo.dngop.so
 vendor/lib64/libcamalgo.eis.so
 vendor/lib64/libcamalgo.fdft.so
@@ -285,6 +320,8 @@ vendor/lib64/libcamalgo.lmv.so
 vendor/lib64/libcamalgo.lsc.so
 vendor/lib64/libcamalgo.mfnr.so
 vendor/lib64/libcamalgo.nr.so
+vendor/lib64/libcamalgo.platform.so
+vendor/lib64/libcamalgo.platform2.so
 vendor/lib64/libcamalgo.utility.so
 vendor/lib64/libcamalgo.warp.so
 vendor/lib64/libcamdrv_imem.so
@@ -294,6 +331,7 @@ vendor/lib64/libcamdrv_twin.so
 vendor/lib64/libcameracustom.eis.so
 vendor/lib64/libcameracustom.plugin.so
 vendor/lib64/libcameracustom.so
+vendor/lib64/libdynamiclog.so
 vendor/lib64/libeffecthal.base.so
 vendor/lib64/libfeature.face.so
 vendor/lib64/libfeature.stereo.provider.so
@@ -303,6 +341,7 @@ vendor/lib64/libfeature_fsc.so
 vendor/lib64/libfeature_lmv.so
 vendor/lib64/libfeature_rss.so
 vendor/lib64/libfeatureiodrv_mem.so
+vendor/lib64/libmtkcam.atmseventmgr.so
 vendor/lib64/libmtkcam.eventcallback.so
 vendor/lib64/libmtkcam.featurepipe.capture.so
 vendor/lib64/libmtkcam.featurepipe.streaming.so
@@ -343,9 +382,11 @@ vendor/lib64/libmtkcam_pipeline_fbm.so
 vendor/lib64/libmtkcam_pipelinemodel.so
 vendor/lib64/libmtkcam_pipelinemodel_adapter.so
 vendor/lib64/libmtkcam_pipelinemodel_capture.so
+vendor/lib64/libmtkcam_pipelinemodel_isp.so
 vendor/lib64/libmtkcam_pipelinemodel_session.so
 vendor/lib64/libmtkcam_pipelinemodel_utils.so
 vendor/lib64/libmtkcam_pipelinemodel_zsl.so
+vendor/lib64/libmtkcam_pipelinepolicy-aov.so
 vendor/lib64/libmtkcam_pipelinepolicy-security.so
 vendor/lib64/libmtkcam_pipelinepolicy-smvr.so
 vendor/lib64/libmtkcam_pipelinepolicy.so
@@ -359,47 +400,50 @@ vendor/lib64/libmtkcam_synchelper.so
 vendor/lib64/libmtkcam_sysutils.so
 vendor/lib64/libmtkcam_tuning_utils.so
 vendor/lib64/libmtkcam_ulog.so
+vendor/lib64/libmtkisp_metadata.so
 vendor/lib64/libremosaic_wrapper.so
 vendor/lib64/libremosaiclib.so
 vendor/lib64/libstereoinfoaccessor_vsdof.so
-vendor/lib64/mtkcam/libmtkcam_streaminfo_plugin-p1stt.so
+vendor/lib64/libtrm.so
+vendor/lib64/libverno.so
 vendor/lib64/s5k3l6_mipi_raw_IdxMgr.so
 vendor/lib64/s5k3l6_mipi_raw_tuning.so
 vendor/lib64/vendor.mediatek.hardware.camera.atms@1.0.so
 vendor/lib64/vendor.mediatek.hardware.camera.bgservice@1.0.so
 vendor/lib64/vendor.mediatek.hardware.camera.bgservice@1.1.so
-vendor/lib64/vendor.mediatek.hardware.camera.ccap@1.0.so
 vendor/lib64/vendor.mediatek.hardware.camera.frhandler@1.0.so
 vendor/lib64/vendor.mediatek.hardware.camera.isphal@1.0.so
+vendor/lib64/vendor.mediatek.hardware.camera.isphal@1.1.so
 vendor/lib64/vendor.mediatek.hardware.camera.lomoeffect@1.0.so
 vendor/lib64/vendor.mediatek.hardware.camera.postproc@1.0.so
 vendor/lib64/vendor.mediatek.hardware.camera.security@1.0.so
 
 # Display
 vendor/bin/hw/android.hardware.graphics.allocator@4.0-service-mediatek
-vendor/bin/hw/vendor.mediatek.hardware.gpu@1.0-service
 vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service
 vendor/etc/init/android.hardware.graphics.allocator@4.0-service-mediatek.rc
-vendor/etc/init/vendor.mediatek.hardware.gpu@1.0-service.rc
 vendor/etc/init/vendor.mediatek.hardware.pq@2.2-service.rc
-vendor/etc/meow.cfg
--vendor/etc/vintf/manifest/android.hardware.gpu@1.0-service.xml
+vendor/etc/vintf/manifest/manifest_hwcomposer.xml
 vendor/lib/egl/egl.cfg
 vendor/lib/egl/libEGL_mtk.so
 vendor/lib/egl/libGLES_meow.so
 vendor/lib/egl/libGLESv1_CM_mtk.so
 vendor/lib/egl/libGLESv2_mtk.so
+vendor/lib/egl/libMEOW_data.so
 vendor/lib/egl/libMEOW_gift.so
+vendor/lib/egl/libMEOW_qt.so
 vendor/lib/egl/libMEOW_trace.so
 vendor/lib/hw/android.hardware.graphics.mapper@4.0-impl-mediatek.so
 vendor/lib/hw/gralloc.rogue.so
-vendor/lib/hw/memtrack.mt6765.so
-vendor/lib/hw/vendor.mediatek.hardware.pq@2.6-impl.so
+vendor/lib/hw/memtrack.default.so
+vendor/lib/hw/vendor.mediatek.hardware.pq@2.14-impl.so
+vendor/lib/mt6765/libdpframework.so
+vendor/lib/mt6765/libmtk_drvb.so
+vendor/lib/mt6765/libpq_prot.so
 vendor/lib/libDefaultFpsActor.so
 vendor/lib/libFrameRecord.so
 vendor/lib/libIMGegl.so
 vendor/lib/libNoFpsActor.so
-vendor/lib/libdpframework.so
 vendor/lib/libged.so
 vendor/lib/libglslcompiler.so
 vendor/lib/libgpu_aux.so
@@ -410,39 +454,52 @@ vendor/lib/libgralloctypes_mtk.so
 vendor/lib/libion_mtk.so
 vendor/lib/libion_ulit.so
 vendor/lib/libmemtrack_GL.so
+vendor/lib/libmml.so
 vendor/lib/libmpvr.so
-vendor/lib/libmtk_drvb.so
 vendor/lib/libpq_cust_base.so
-vendor/lib/libpq_prot.so
+vendor/lib/libpqframework.so
+vendor/lib/libpqparamparser.so
+vendor/lib/libpqpconfig.so
 vendor/lib/libsrv_um.so
 vendor/lib/libudf.so
 vendor/lib/libufwriter.so
 vendor/lib/libusc.so
-vendor/lib/vendor.mediatek.hardware.gpu@1.0.so
 vendor/lib/vendor.mediatek.hardware.pq@2.0.so
 vendor/lib/vendor.mediatek.hardware.pq@2.1.so
+vendor/lib/vendor.mediatek.hardware.pq@2.10.so
+vendor/lib/vendor.mediatek.hardware.pq@2.11.so
+vendor/lib/vendor.mediatek.hardware.pq@2.12.so
+vendor/lib/vendor.mediatek.hardware.pq@2.13.so
+vendor/lib/vendor.mediatek.hardware.pq@2.14.so
 vendor/lib/vendor.mediatek.hardware.pq@2.2.so
 vendor/lib/vendor.mediatek.hardware.pq@2.3.so
 vendor/lib/vendor.mediatek.hardware.pq@2.4.so
 vendor/lib/vendor.mediatek.hardware.pq@2.5.so
 vendor/lib/vendor.mediatek.hardware.pq@2.6.so
+vendor/lib/vendor.mediatek.hardware.pq@2.7.so
+vendor/lib/vendor.mediatek.hardware.pq@2.8.so
+vendor/lib/vendor.mediatek.hardware.pq@2.9.so
 vendor/lib64/egl/libEGL_mtk.so
 vendor/lib64/egl/libGLES_meow.so
 vendor/lib64/egl/libGLESv1_CM_mtk.so
 vendor/lib64/egl/libGLESv2_mtk.so
+vendor/lib64/egl/libMEOW_data.so
 vendor/lib64/egl/libMEOW_gift.so
+vendor/lib64/egl/libMEOW_qt.so
 vendor/lib64/egl/libMEOW_trace.so
-vendor/lib64/hw/android.hardware.graphics.composer@2.1-impl.so
 vendor/lib64/hw/android.hardware.graphics.mapper@4.0-impl-mediatek.so
 vendor/lib64/hw/gralloc.rogue.so
 vendor/lib64/hw/hwcomposer.mt6765.so
-vendor/lib64/hw/memtrack.mt6765.so
-vendor/lib64/hw/vendor.mediatek.hardware.pq@2.6-impl.so
+vendor/lib64/hw/memtrack.default.so
+vendor/lib64/hw/vendor.mediatek.hardware.pq@2.14-impl.so
+vendor/lib64/mt6765/libdpframework.so
+vendor/lib64/mt6765/libmtk_drvb.so
+vendor/lib64/mt6765/libpq_prot.so
 vendor/lib64/libDefaultFpsActor.so
 vendor/lib64/libFrameRecord.so
 vendor/lib64/libIMGegl.so
 vendor/lib64/libNoFpsActor.so
-vendor/lib64/libdpframework.so
+vendor/lib64/libcomposer_ext.so
 vendor/lib64/libged.so
 vendor/lib64/libglslcompiler.so
 vendor/lib64/libgpu_aux.so
@@ -453,22 +510,32 @@ vendor/lib64/libgralloctypes_mtk.so
 vendor/lib64/libion_mtk.so
 vendor/lib64/libion_ulit.so
 vendor/lib64/libmemtrack_GL.so
+vendor/lib64/libmml.so
 vendor/lib64/libmpvr.so
-vendor/lib64/libmtk_drvb.so
 vendor/lib64/libpq_cust_base.so
-vendor/lib64/libpq_prot.so
+vendor/lib64/libpqframework.so
+vendor/lib64/libpqparamparser.so
+vendor/lib64/libpqpconfig.so
 vendor/lib64/libsrv_um.so
 vendor/lib64/libudf.so
 vendor/lib64/libufwriter.so
 vendor/lib64/libusc.so
-vendor/lib64/vendor.mediatek.hardware.gpu@1.0.so
+vendor/lib64/vendor.mediatek.hardware.composer_ext@1.0.so
 vendor/lib64/vendor.mediatek.hardware.pq@2.0.so
 vendor/lib64/vendor.mediatek.hardware.pq@2.1.so
+vendor/lib64/vendor.mediatek.hardware.pq@2.10.so
+vendor/lib64/vendor.mediatek.hardware.pq@2.11.so
+vendor/lib64/vendor.mediatek.hardware.pq@2.12.so
+vendor/lib64/vendor.mediatek.hardware.pq@2.13.so
+vendor/lib64/vendor.mediatek.hardware.pq@2.14.so
 vendor/lib64/vendor.mediatek.hardware.pq@2.2.so
 vendor/lib64/vendor.mediatek.hardware.pq@2.3.so
 vendor/lib64/vendor.mediatek.hardware.pq@2.4.so
 vendor/lib64/vendor.mediatek.hardware.pq@2.5.so
 vendor/lib64/vendor.mediatek.hardware.pq@2.6.so
+vendor/lib64/vendor.mediatek.hardware.pq@2.7.so
+vendor/lib64/vendor.mediatek.hardware.pq@2.8.so
+vendor/lib64/vendor.mediatek.hardware.pq@2.9.so
 
 # Display (PowerVR)
 vendor/lib/libPVRMtkutils.so
@@ -483,25 +550,13 @@ vendor/lib/hw/vulkan.mt6765.so
 vendor/lib64/hw/vulkan.mt6765.so
 
 # DRM
-vendor/bin/hw/android.hardware.drm@1.3-service.widevine
-vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
--vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
-vendor/lib/libwvhidl.so
+vendor/bin/hw/android.hardware.drm@1.4-service.widevine
+vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
+vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml
 vendor/lib/mediadrm/libwvdrmengine.so
-vendor/lib64/libwvhidl.so
+vendor/lib/libwvhidl.so
 vendor/lib64/mediadrm/libwvdrmengine.so
-
-# Factory
-vendor/bin/factory
-vendor/bin/meta_tst
-vendor/etc/init/hw/factory_init.connectivity.rc
-vendor/etc/init/hw/factory_init.project.rc
-vendor/etc/init/hw/factory_init.rc
-vendor/etc/init/hw/meta_init.connectivity.rc
-vendor/etc/init/hw/meta_init.modem.rc
-vendor/etc/init/hw/meta_init.project.rc
-vendor/etc/init/hw/meta_init.rc
-vendor/etc/init/hw/multi_init.rc
+vendor/lib64/libwvhidl.so
 
 # Firmware
 vendor/bin/lib3a.ccu.dm
@@ -509,34 +564,31 @@ vendor/bin/lib3a.ccu.pm
 vendor/etc/MNL_Config.xml
 vendor/firmware/BT_FW.cfg
 vendor/firmware/WIFI_RAM_CODE_soc1_0_1_1.bin
-vendor/firmware/WMT_SOC.cfg
 vendor/firmware/aw87xxx_pid_59_music_1.bin
 vendor/firmware/aw87xxx_pid_59_off_1.bin
 vendor/firmware/aw87xxx_vmax_1.bin
 vendor/firmware/fm_cust.cfg
+vendor/firmware/lib3a.ccu
 vendor/firmware/mt6631_fm_v1_coeff.bin
 vendor/firmware/mt6631_fm_v1_patch.bin
+vendor/firmware/remoteproc_scp
 vendor/firmware/rgx.fw
 vendor/firmware/rgx.sh
 vendor/firmware/soc1_0_patch_mcu_1_1_hdr.bin
 vendor/firmware/soc1_0_ram_bt_1_1_hdr.bin
 vendor/firmware/soc1_0_ram_mcu_1_1_hdr.bin
 vendor/firmware/soc1_0_ram_wifi_1_1_hdr.bin
-vendor/firmware/soc3_0_ram_bt_1_1_hdr.bin
-vendor/firmware/soc3_0_ram_bt_1a_1_hdr.bin
-vendor/firmware/soc3_0_ram_mcu_1_1_hdr.bin
-vendor/firmware/soc3_0_ram_mcu_1a_1_hdr.bin
-vendor/firmware/soc3_0_ram_mcu_e1_hdr.bin
 vendor/firmware/st21nfc_fw7.bin
 
-# GPS
-vendor/bin/hw/android.hardware.gnss@2.1-service-mediatek
-vendor/bin/lbs_hidl_service
+# Gatekeeper
+vendor/lib/hw/libSoftGatekeeper.so
+vendor/lib64/hw/libSoftGatekeeper.so
+
+# GNSS
+vendor/bin/hw/android.hardware.gnss-service.mediatek
 vendor/bin/mtk_agpsd
-vendor/etc/gnss/agps_profiles_conf2.xml
 vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_ATnT_Mexico.xml
 vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_ATnT_US.xml
-vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_CT.xml
 vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Claro_Peru.xml
 vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Entel_Peru.xml
 vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_KDDI.xml
@@ -547,17 +599,17 @@ vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_T-Mobile_US.xml
 vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Test_SIM1.xml
 vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Test_SIM2.xml
 vendor/etc/gnss/carrier/agps_profiles_conf2_carrier_Verizon_Wireless.xml
-vendor/etc/init/android.hardware.gnss@2.1-service-mediatek.rc
+vendor/etc/gnss/agps_profiles_conf2.xml
+vendor/etc/init/android.hardware.gnss-service.mediatek.rc
 vendor/etc/init/init.gps_drv.rc
-vendor/etc/init/lbs_hidl_service.rc
 vendor/etc/init/mtk_agpsd_p.rc
-vendor/etc/security/cacerts/00673b5b.0
+vendor/etc/security/cacerts/01419da9.0
 vendor/etc/security/cacerts/04f60c28.0
 vendor/etc/security/cacerts/0d69c7e1.0
 vendor/etc/security/cacerts/10531352.0
 vendor/etc/security/cacerts/111e6273.0
 vendor/etc/security/cacerts/12d55845.0
-vendor/etc/security/cacerts/1dcd6f4c.0
+vendor/etc/security/cacerts/1ae85e5e.0
 vendor/etc/security/cacerts/1df5a75f.0
 vendor/etc/security/cacerts/1e1eab7c.0
 vendor/etc/security/cacerts/1e8e7201.0
@@ -576,14 +628,11 @@ vendor/etc/security/cacerts/33ee480d.0
 vendor/etc/security/cacerts/343eb6cb.0
 vendor/etc/security/cacerts/35105088.0
 vendor/etc/security/cacerts/399e7759.0
-vendor/etc/security/cacerts/3a3b02ce.0
 vendor/etc/security/cacerts/3ad48a91.0
-vendor/etc/security/cacerts/3c58f906.0
 vendor/etc/security/cacerts/3c6676aa.0
 vendor/etc/security/cacerts/3c860d51.0
 vendor/etc/security/cacerts/3c899c73.0
 vendor/etc/security/cacerts/3c9a4d3b.0
-vendor/etc/security/cacerts/3d441de8.0
 vendor/etc/security/cacerts/3e7271e8.0
 vendor/etc/security/cacerts/40dc992e.0
 vendor/etc/security/cacerts/455f1b52.0
@@ -597,48 +646,44 @@ vendor/etc/security/cacerts/5a250ea7.0
 vendor/etc/security/cacerts/5a3f0ff8.0
 vendor/etc/security/cacerts/5acf816d.0
 vendor/etc/security/cacerts/5cf9d536.0
-vendor/etc/security/cacerts/5e4e69e7.0
 vendor/etc/security/cacerts/5f47b495.0
 vendor/etc/security/cacerts/60afe812.0
 vendor/etc/security/cacerts/6187b673.0
 vendor/etc/security/cacerts/63a2c897.0
-vendor/etc/security/cacerts/67495436.0
 vendor/etc/security/cacerts/69105f4f.0
 vendor/etc/security/cacerts/6b03dec0.0
 vendor/etc/security/cacerts/75680d2e.0
 vendor/etc/security/cacerts/76579174.0
 vendor/etc/security/cacerts/7892ad52.0
-vendor/etc/security/cacerts/7999be0d.0
 vendor/etc/security/cacerts/7a7c655d.0
 vendor/etc/security/cacerts/7a819ef2.0
 vendor/etc/security/cacerts/7c302982.0
-vendor/etc/security/cacerts/7d453d8f.0
 vendor/etc/security/cacerts/81b9768f.0
 vendor/etc/security/cacerts/82223c44.0
+vendor/etc/security/cacerts/83e9984f.0
 vendor/etc/security/cacerts/85cde254.0
 vendor/etc/security/cacerts/86212b19.0
 vendor/etc/security/cacerts/869fbf79.0
-vendor/etc/security/cacerts/87753b0d.0
 vendor/etc/security/cacerts/882de061.0
 vendor/etc/security/cacerts/88950faa.0
 vendor/etc/security/cacerts/89c02a45.0
 vendor/etc/security/cacerts/8d6437c3.0
-vendor/etc/security/cacerts/91739615.0
 vendor/etc/security/cacerts/9282e51c.0
 vendor/etc/security/cacerts/9339512a.0
 vendor/etc/security/cacerts/9479c8c3.0
 vendor/etc/security/cacerts/9576d26b.0
+vendor/etc/security/cacerts/9591a472.0
 vendor/etc/security/cacerts/95aff9e3.0
 vendor/etc/security/cacerts/9685a493.0
-vendor/etc/security/cacerts/9772ca32.0
 vendor/etc/security/cacerts/985c1f52.0
+vendor/etc/security/cacerts/9aef356c.0
 vendor/etc/security/cacerts/9d6523ce.0
 vendor/etc/security/cacerts/9f533518.0
 vendor/etc/security/cacerts/a2c66da8.0
 vendor/etc/security/cacerts/a3896b44.0
 vendor/etc/security/cacerts/a7605362.0
-vendor/etc/security/cacerts/a7d2cf64.0
 vendor/etc/security/cacerts/a81e292b.0
+vendor/etc/security/cacerts/a9d40e02.0
 vendor/etc/security/cacerts/ab5346f4.0
 vendor/etc/security/cacerts/ab59055e.0
 vendor/etc/security/cacerts/aeb67534.0
@@ -657,8 +702,6 @@ vendor/etc/security/cacerts/c2c1704e.0
 vendor/etc/security/cacerts/c491639e.0
 vendor/etc/security/cacerts/c51c224c.0
 vendor/etc/security/cacerts/c559d742.0
-vendor/etc/security/cacerts/c7e2a638.0
-vendor/etc/security/cacerts/c907e29b.0
 vendor/etc/security/cacerts/c90bc37d.0
 vendor/etc/security/cacerts/cb156124.0
 vendor/etc/security/cacerts/cb1c3204.0
@@ -668,6 +711,7 @@ vendor/etc/security/cacerts/d06393bb.0
 vendor/etc/security/cacerts/d0cddf45.0
 vendor/etc/security/cacerts/d16a5865.0
 vendor/etc/security/cacerts/d18e9066.0
+vendor/etc/security/cacerts/d39b0a2c.0
 vendor/etc/security/cacerts/d41b5e2a.0
 vendor/etc/security/cacerts/d4c339cb.0
 vendor/etc/security/cacerts/d59297b8.0
@@ -679,33 +723,21 @@ vendor/etc/security/cacerts/dc99f41e.0
 vendor/etc/security/cacerts/dfc0fe80.0
 vendor/etc/security/cacerts/e442e424.0
 vendor/etc/security/cacerts/e48193cf.0
-vendor/etc/security/cacerts/e775ed2d.0
 vendor/etc/security/cacerts/e8651083.0
 vendor/etc/security/cacerts/ed39abd0.0
+vendor/etc/security/cacerts/edcbddb5.0
 vendor/etc/security/cacerts/f013ecaf.0
 vendor/etc/security/cacerts/f0cd152c.0
 vendor/etc/security/cacerts/f459871d.0
-vendor/etc/security/cacerts/facacbc6.0
 vendor/etc/security/cacerts/fb5fa911.0
 vendor/etc/security/cacerts/fd08c599.0
 vendor/etc/security/cacerts/fde84897.0
-vendor/etc/security/cacerts_supl/111e6273.0
-vendor/etc/security/cacerts_supl/3ad48a91.0
-vendor/etc/security/cacerts_supl/7651b327.0
-vendor/etc/security/cacerts_supl/c542733d.0
-vendor/etc/security/cacerts_supl/f336e3d1.0
 vendor/etc/security/cacerts_supl/lab/18dc3a8d.0
 vendor/etc/security/cacerts_supl/lab/1bc5ca0c.0
 vendor/etc/security/cacerts_supl/lab/1bc5ca0c.1
 vendor/etc/security/cacerts_supl/lab/2cbfcc3a.0
 vendor/etc/security/cacerts_supl/lab/35ef1c14.0
-vendor/etc/security/cacerts_supl/lab/35ef1c14.1
-vendor/etc/security/cacerts_supl/lab/35ef1c14.2
-vendor/etc/security/cacerts_supl/lab/35ef1c14.3
-vendor/etc/security/cacerts_supl/lab/35ef1c14.4
-vendor/etc/security/cacerts_supl/lab/35ef1c14.5
-vendor/etc/security/cacerts_supl/lab/35ef1c14.6
-vendor/etc/security/cacerts_supl/lab/35ef1c14.7
+vendor/etc/security/cacerts_supl/lab/399e7759.0
 vendor/etc/security/cacerts_supl/lab/586933d9.0
 vendor/etc/security/cacerts_supl/lab/66272d0d.0
 vendor/etc/security/cacerts_supl/lab/6f1dbe5e.0
@@ -713,23 +745,25 @@ vendor/etc/security/cacerts_supl/lab/b5805141.0
 vendor/etc/security/cacerts_supl/lab/b805b58a.0
 vendor/etc/security/cacerts_supl/lab/ed7b215e.0
 vendor/etc/security/cacerts_supl/lab/ef4b31e6.0
+vendor/etc/security/cacerts_supl/111e6273.0
+vendor/etc/security/cacerts_supl/3ad48a91.0
+vendor/etc/security/cacerts_supl/7651b327.0
+vendor/etc/security/cacerts_supl/c542733d.0
+vendor/etc/security/cacerts_supl/f336e3d1.0
+vendor/etc/vintf/manifest/gnss-default.xml:vendor/etc/vintf/manifest/gnss-mtk.xml
+vendor/etc/vintf/manifest/gnss@2.1-service.xml:vendor/etc/vintf/manifest/gnss@2.1-service-mtk.xml
 vendor/etc/slp_conf
 vendor/lib/hw/gps.default.so
-vendor/lib/libDR.so
-vendor/lib/libmnl.so
+vendor/lib64/hw/android.hardware.gnss-impl-mediatek.so
 vendor/lib64/hw/android.hardware.gnss@2.1-impl-mediatek.so
 vendor/lib64/hw/gps.default.so
-vendor/lib64/lbs_hidl_service-impl.so
-vendor/lib64/vendor.mediatek.hardware.lbs@1.0.so
+vendor/lib64/libDR.so
 
 # Health
 vendor/bin/fuelgauged
 vendor/etc/init/fuelgauged_init.rc
 vendor/lib/libfgauge_gm30.so
 
-# ImsService - from modified stock
--priv-app/ImsService/ImsService.apk|eec85a1e84bd656c621b5f1cc37d19d112f1bf6c
-
 # IMS
 bin/vtservice
 etc/init/init.vtservice.rc
@@ -737,88 +771,95 @@ etc/init/init.vtservice.rc
 -framework/mediatek-framework.jar
 -framework/mediatek-ims-base.jar
 -framework/mediatek-ims-common.jar
--framework/mediatek-ims-extension-plugin.jar
--framework/mediatek-ims-legacy.jar
--framework/mediatek-ims-wwop-common.jar
+framework/mediatek-ims-extension-plugin.jar
+framework/mediatek-ims-legacy.jar
 -framework/mediatek-telecom-common.jar
 -framework/mediatek-telephony-base.jar
 -framework/mediatek-telephony-common.jar
--framework/mediatek-wfo-legacy.jar
-lib/libcomutils.so
-lib/libimsma.so
-lib/libimsma_adapt.so
-lib/libimsma_rtp.so
-lib/libimsma_socketwrapper.so
-lib/libmtk_vt_service.so
+framework/mediatek-wfo-legacy.jar
 lib/libmtk_vt_wrapper.so
 lib/libmtkavenhancements.so
-lib/libsignal.so
-lib/libsink.so
-lib/libsource.so
+lib/libmtkperf_client.so
+lib/libvcodec_cap.so
 lib/libvcodec_cap.so
-lib/libvcodec_capenc.so
-lib/libvt_avsync.so
+lib/libvsim-adaptor-client.so
+lib64/libcomutils.so
+lib64/libimsma.so
+lib64/libimsma_adapt.so
+lib64/libimsma_rtp.so
+lib64/libimsma_socketwrapper.so
+lib64/libmtk_vt_service.so
 lib64/libmtk_vt_wrapper.so
 lib64/libmtkavenhancements.so
+lib64/libmtkperf_client.so
+lib64/libsignal.so
+lib64/libsink.so
+lib64/libsource.so
 lib64/libvcodec_cap.so
 lib64/libvcodec_capenc.so
-system_ext/lib/vendor.mediatek.hardware.mtkradioex@2.0.so
+lib64/libvsim-adaptor-client.so
+lib64/libvt_avsync.so
 system_ext/lib/vendor.mediatek.hardware.videotelephony@1.0.so
-system_ext/lib64/vendor.mediatek.hardware.mtkradioex@2.0.so
 system_ext/lib64/vendor.mediatek.hardware.videotelephony@1.0.so
-vendor/bin/epdg_wod
+vendor/bin/hw/vendor.mediatek.hardware.mmagent@1.1-service
 vendor/bin/hw/vtservice_hidl
-vendor/bin/muxreport
+vendor/bin/ipsec_mon
+vendor/bin/lbs_hidl_service
+vendor/bin/rcs_volte_stack
+vendor/bin/volte_clientapi_ua
 vendor/bin/volte_imcb
 vendor/bin/volte_imsm_93
 vendor/bin/volte_md_status
+vendor/bin/volte_rcs_ua
 vendor/bin/volte_stack
 vendor/bin/volte_ua
-vendor/bin/wfca
 vendor/etc/init/init.volte_imcb.rc
 vendor/etc/init/init.volte_imsm_93.rc
 vendor/etc/init/init.volte_md_status.rc
 vendor/etc/init/init.volte_stack.rc
 vendor/etc/init/init.volte_ua.rc
 vendor/etc/init/init.vtservice_hidl.rc
-vendor/etc/init/init.wfca.rc
-vendor/etc/init/init.wod.rc
-vendor/etc/init/muxreport.rc
+vendor/etc/init/ipsec_mon.rc
+vendor/etc/init/lbs_hidl_service.rc
+vendor/etc/init/vendor.mediatek.hardware.mmagent@1.1-service.rc
+vendor/etc/init/volte_clientapi_ua.rc
+vendor/etc/init/volte_rcs_ua.rc
+vendor/etc/vintf/manifest/lbs_hidl_service@1.0.xml
 vendor/lib/hw/vendor.mediatek.hardware.videotelephony@1.0-impl.so
-vendor/lib/libMtkSpeechEnh.so
 vendor/lib/libipsec_ims_shr.so
-vendor/lib/libmnetlink_v104.so
-vendor/lib/libmsbc_mtk.so
-vendor/lib/libmtcloader.so
-vendor/lib/libmtklimiter_vendor.so
-vendor/lib/libmtkshifter_vendor.so
-vendor/lib/libverno.so
+vendor/lib/librcs_interface.so
+vendor/lib/librcs_volte_core.so
 vendor/lib/libvolte_core_shr.so
 vendor/lib/libvolte_xdmc_shr.so
 vendor/lib/libvt_custom.so
-vendor/lib/libwapi.so
-vendor/lib/libwo.so
+vendor/lib/vendor.mediatek.hardware.mmagent@1.0.so
+vendor/lib/vendor.mediatek.hardware.mmagent@1.1.so
+vendor/lib/vendor.mediatek.hardware.rcs@2.0.so
 vendor/lib/vendor.mediatek.hardware.videotelephony@1.0.so
 vendor/lib64/hw/vendor.mediatek.hardware.videotelephony@1.0-impl.so
+vendor/lib64/lbs_hidl_service-impl.so
+vendor/lib64/libimsg_log.so
 vendor/lib64/libipsec_ims_shr.so
-vendor/lib64/libmnetlink_v104.so
+vendor/lib64/libmmagent.so
 vendor/lib64/libmtklimiter_vendor.so
+vendor/lib64/libmtknetcap.so
 vendor/lib64/libmtknetutils.so
 vendor/lib64/libmtkshifter_vendor.so
+vendor/lib64/libmtkspparser.so
 vendor/lib64/libmtksysutils.so
-vendor/lib64/libmtktinyxml.so
-vendor/lib64/libtqvalidate.so
-vendor/lib64/libverno.so
-vendor/lib64/libwapi.so
-vendor/lib64/vendor.mediatek.hardware.mtkradioex@2.0.so
-vendor/lib64/vendor.mediatek.hardware.mtkradioex@2.1.so
-vendor/lib64/vendor.mediatek.hardware.mtkradioex@2.2.so
+vendor/lib64/vendor.mediatek.hardware.clientapi@1.0.so
+vendor/lib64/vendor.mediatek.hardware.dmc@1.0.so
+vendor/lib64/vendor.mediatek.hardware.dmc@1.1.so
+vendor/lib64/vendor.mediatek.hardware.dmc@1.2.so
+vendor/lib64/vendor.mediatek.hardware.lbs@1.0.so
+vendor/lib64/vendor.mediatek.hardware.mmagent@1.0.so
+vendor/lib64/vendor.mediatek.hardware.mmagent@1.1.so
 vendor/lib64/vendor.mediatek.hardware.videotelephony@1.0.so
 
+# ImsService
+-priv-app/ImsService/ImsService.apk
+
 # IPSec
-vendor/bin/ipsec_mon
-vendor/etc/init/ipsec_mon.rc
-vendor/etc/ipsec/ipsec.conf
 vendor/etc/ipsec/ipsec.d/cacerts/DigiCertGlobalRootCA.crt
 vendor/etc/ipsec/ipsec.d/cacerts/DigiCertGlobalRootG2.crt
 vendor/etc/ipsec/ipsec.d/cacerts/DigiCertGlobalRootG3.crt
@@ -835,13 +876,14 @@ vendor/etc/ipsec/ipsec.d/cacerts/VeriSignUniversalRootCertification.der
 vendor/etc/ipsec/ipsec.d/cacerts/gold.cer
 vendor/etc/ipsec/ipsec.d/cacerts/thawte.der
 vendor/etc/ipsec/ssl/openssl.cnf
+vendor/etc/ipsec/ipsec.conf
 vendor/etc/ipsec/strongswan.conf
 
 # Kernel Power Off Charging (KPOC)
 bin/kpoc_charger
 etc/init/kpoc_charger.rc
-lib/libshowlogo.so
-lib/libsysenv_system.so
+lib64/libshowlogo.so
+lib64/libsysenv_system.so
 
 # Lights
 vendor/bin/hw/android.hardware.lights-service.mediatek
@@ -850,56 +892,56 @@ vendor/etc/init/lights-mtk-default.rc
 vendor/lib/hw/lights.mt6765.so
 vendor/lib64/hw/lights.mt6765.so
 
-# Media
-vendor/bin/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-service
+# Media Codecs
 vendor/bin/jpegtool
-vendor/etc/init/vendor.mediatek.hardware.mtkcodecservice@1.1-service.rc
 vendor/etc/mtk_omx_core.cfg
-vendor/lib/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-impl.so
+vendor/etc/mtk_platform_codecs_config.xml
 vendor/lib/libHEVCdec_sa.ca7.android.so
-vendor/lib/libJpgDecPipe.so
 vendor/lib/libJpgEncPipe.so
-vendor/lib/libMtkOmxVdecEx.so
-vendor/lib/libMtkOmxVenc.so
-vendor/lib/libSwJpgCodec.so
 vendor/lib/libh264dec_customize.so
 vendor/lib/libh264dec_sa.ca7.so
 vendor/lib/libh264dec_sd.ca7.so
 vendor/lib/libh264dec_se.ca7.so
 vendor/lib/libh264enc_sa.ca7.so
 vendor/lib/libhevce_sb.ca7.android.so
+vendor/lib/libicd_decoder.so
 vendor/lib/libjpeg-alpha-oal_vendor.so
 vendor/lib/libjpeg-alpha_vendor.so
-vendor/lib/libmhalImageCodec.so
 vendor/lib/libmmprofile.so
+vendor/lib/libmp3dec_mtk.so
 vendor/lib/libmp4enc_sa.ca7.so
 vendor/lib/libmp4enc_xa.ca7.so
 vendor/lib/libpixelflinger.so
 vendor/lib/libstagefrighthw.so
-vendor/lib/libvc1dec_sa.ca7.so
 vendor/lib/libvcodec_oal.so
 vendor/lib/libvcodec_utility.so
 vendor/lib/libvcodecdrv.so
+vendor/lib/libvcodecdrv_header_stub.so
 vendor/lib/libvp8dec_sa.ca7.so
 vendor/lib/libvp9dec_sa.ca7.so
-vendor/lib/vendor.mediatek.hardware.mtkcodecservice@1.1.so
-vendor/lib64/hw/vendor.mediatek.hardware.mtkcodecservice@1.1-impl.so
+vendor/lib/libvpu5.so
 vendor/lib64/libJpgEncPipe.so
 vendor/lib64/libMtkOmxCore.so
 vendor/lib64/libacdk.so
+vendor/lib64/libadpcmdec_mtk.so
 vendor/lib64/libfft_vendor.so
+vendor/lib64/libheichal.so
 vendor/lib64/libhevce_sb.ca7.android.so
+vendor/lib64/libicd_decoder.so
 vendor/lib64/libifcutils_mtk.so
 vendor/lib64/libimageio.so
 vendor/lib64/libimageio_plat_pipe.so
 vendor/lib64/libjpeg-alpha-oal_vendor.so
 vendor/lib64/libjpeg-alpha_vendor.so
 vendor/lib64/libminiui.so
+vendor/lib64/libmp3dec_mtk.so
 vendor/lib64/libpixelflinger.so
 vendor/lib64/libstagefrighthw.so
+vendor/lib64/libthha.so
 vendor/lib64/libvcodec_oal.so
 vendor/lib64/libvcodec_utility.so
-vendor/lib64/vendor.mediatek.hardware.mtkcodecservice@1.1.so
+vendor/lib64/libvcodecdrv_header_stub.so
+vendor/lib64/libvpu5.so
 
 # Media (OMX)
 vendor/lib/libMtkOmxAdpcmDec.so
@@ -909,43 +951,75 @@ vendor/lib/libMtkOmxCore.so
 vendor/lib/libMtkOmxGsmDec.so
 vendor/lib/libMtkOmxMp3Dec.so
 
+# Media (Codec2)
+vendor/bin/hw/android.hardware.media.c2@1.2-mediatek
+vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b
+vendor/etc/init/android.hardware.media.c2@1.2-mediatek.rc
+vendor/etc/vintf/manifest/manifest_media_c2_V1_2_default.xml
+vendor/lib/libcodec2_mtk_c2store.so
+vendor/lib/libcodec2_mtk_vdec.so
+vendor/lib/libcodec2_mtk_venc.so
+vendor/lib/libcodec2_soft_mtk_alacdec.so
+vendor/lib/libcodec2_soft_mtk_apedec.so
+vendor/lib/libcodec2_soft_mtk_imaadpcmdec.so
+vendor/lib/libcodec2_soft_mtk_mp3dec.so
+vendor/lib/libcodec2_soft_mtk_msadpcmdec.so
+vendor/lib/libcodec2_vpp_qt_plugin.so
+vendor/lib/libcodec2_vpp_rs_plugin.so
+vendor/lib/libformatter.so
+vendor/lib64/libcodec2_mtk_c2store.so
+vendor/lib64/libcodec2_mtk_vdec.so
+vendor/lib64/libcodec2_mtk_venc.so
+vendor/lib64/libcodec2_soft_mtk_alacdec.so
+vendor/lib64/libcodec2_soft_mtk_apedec.so
+vendor/lib64/libcodec2_soft_mtk_imaadpcmdec.so
+vendor/lib64/libcodec2_soft_mtk_mp3dec.so
+vendor/lib64/libcodec2_soft_mtk_msadpcmdec.so
+vendor/lib64/libcodec2_vpp_qt_plugin.so
+vendor/lib64/libcodec2_vpp_rs_plugin.so
+vendor/lib64/libformatter.so
+
 # MMS
-vendor/bin/hw/vendor.mediatek.hardware.mms@1.5-service
-vendor/etc/init/vendor.mediatek.hardware.mms@1.5-service.rc
-vendor/lib/hw/vendor.mediatek.hardware.mms@1.5-impl.so
+vendor/bin/hw/vendor.mediatek.hardware.mms@1.6-service
+vendor/etc/init/vendor.mediatek.hardware.mms@1.6-service.rc
+vendor/lib/hw/vendor.mediatek.hardware.mms@1.6-impl.so
 vendor/lib/vendor.mediatek.hardware.mms@1.0.so
 vendor/lib/vendor.mediatek.hardware.mms@1.1.so
 vendor/lib/vendor.mediatek.hardware.mms@1.2.so
 vendor/lib/vendor.mediatek.hardware.mms@1.3.so
 vendor/lib/vendor.mediatek.hardware.mms@1.4.so
 vendor/lib/vendor.mediatek.hardware.mms@1.5.so
-vendor/lib64/hw/vendor.mediatek.hardware.mms@1.5-impl.so
+vendor/lib/vendor.mediatek.hardware.mms@1.6.so
+vendor/lib64/hw/vendor.mediatek.hardware.mms@1.6-impl.so
 vendor/lib64/vendor.mediatek.hardware.mms@1.0.so
 vendor/lib64/vendor.mediatek.hardware.mms@1.1.so
 vendor/lib64/vendor.mediatek.hardware.mms@1.2.so
 vendor/lib64/vendor.mediatek.hardware.mms@1.3.so
 vendor/lib64/vendor.mediatek.hardware.mms@1.4.so
 vendor/lib64/vendor.mediatek.hardware.mms@1.5.so
+vendor/lib64/vendor.mediatek.hardware.mms@1.6.so
 
 # Neural Networks
 vendor/lib/libOpenCL.so
 vendor/lib/libneuropilot_hal_utils.so
+vendor/lib/libnxp_extamp_intf.so
 vendor/lib64/libOpenCL.so
 vendor/lib64/libneuropilot_hal_utils.so
+vendor/lib64/libnxp_extamp_intf.so
 
 # NFC
-etc/nfcee_access.xml
 system_ext/etc/permissions/system-ext-permissions-mediatek.xml
 vendor/bin/STFlashTool
 vendor/bin/nfcstackp-vendor
 vendor/bin/st_factorytests-vendor
 vendor/etc/init/hw/init.stnfc.rc
+vendor/etc/libnfc-hal-st.conf
 vendor/etc/libnfc-nci.conf
 vendor/etc/st21nfc_conf.txt
 
 # NVRAM
-vendor/bin/fuelgauged_nvram
 vendor/bin/hw/vendor.mediatek.hardware.nvram@1.1-service
+vendor/bin/fuelgauged_nvram
 vendor/bin/nvram_daemon
 vendor/etc/init/fuelgauged_nvram_init.rc
 vendor/etc/init/nvram_daemon.rc
@@ -954,65 +1028,67 @@ vendor/lib/hw/vendor.mediatek.hardware.nvram@1.1-impl.so
 vendor/lib/libcustom_nvram.so
 vendor/lib/libfile_op.so
 vendor/lib/libnvram.so
-vendor/lib/libnvram_daemon_callback.so
-vendor/lib/libnvram_platform.so
 vendor/lib/libnvram_sec.so
-vendor/lib/libstorage_otp.so
 vendor/lib/vendor.mediatek.hardware.nvram@1.0.so
 vendor/lib/vendor.mediatek.hardware.nvram@1.1.so
 vendor/lib64/hw/vendor.mediatek.hardware.nvram@1.1-impl.so
 vendor/lib64/libcustom_nvram.so
 vendor/lib64/libfile_op.so
 vendor/lib64/libnvram.so
-vendor/lib64/libnvram_daemon_callback.so
-vendor/lib64/libnvram_platform.so
 vendor/lib64/libnvram_sec.so
+vendor/lib64/libstorage_otp.so
 vendor/lib64/vendor.mediatek.hardware.nvram@1.0.so
 vendor/lib64/vendor.mediatek.hardware.nvram@1.1.so
 
 # Power
-vendor/bin/hw/power_native_test_v_1_0
-vendor/bin/hw/power_native_test_v_1_1
 vendor/bin/hw/vendor.mediatek.hardware.mtkpower@1.0-service
+vendor/etc/init/init.fpsgo.rc
 vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-init.rc
 vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-service.rc
--vendor/etc/vintf/manifest/power-default.xml
-vendor/lib/hw/power.mt6765.so
-vendor/lib/hw/vendor.mediatek.hardware.mtkpower@1.1-impl.so
+vendor/etc/vintf/manifest/power-default.xml
+vendor/lib/hw/vendor.mediatek.hardware.mtkpower@1.2-impl.so
 vendor/lib/libperfctl_vendor.so
+vendor/lib/libpower_timer.so
 vendor/lib/libpowerhal.so
 vendor/lib/libpowerhalwrap_vendor.so
 vendor/lib/vendor.mediatek.hardware.mtkpower@1.0.so
 vendor/lib/vendor.mediatek.hardware.mtkpower@1.1.so
-vendor/lib64/hw/power.mt6765.so
-vendor/lib64/hw/vendor.mediatek.hardware.mtkpower@1.1-impl.so
+vendor/lib/vendor.mediatek.hardware.mtkpower@1.2.so
+vendor/lib64/hw/vendor.mediatek.hardware.mtkpower@1.2-impl.so
+vendor/lib64/android.hardware.power-service-mediatek.so
 vendor/lib64/libmtkperf_client_vendor.so
 vendor/lib64/libperfctl_vendor.so
+vendor/lib64/libpower_timer.so
 vendor/lib64/libpowerhal.so
 vendor/lib64/libpowerhalwrap_vendor.so
 vendor/lib64/vendor.mediatek.hardware.mtkpower@1.0.so
 vendor/lib64/vendor.mediatek.hardware.mtkpower@1.1.so
+vendor/lib64/vendor.mediatek.hardware.mtkpower@1.2.so
 vendor/lib64/vendor.mediatek.hardware.power@1.1.so
 vendor/lib64/vendor.mediatek.hardware.power@2.0.so
 
-# Power AIDL - DT2W
-vendor/lib64/android.hardware.power-service-mediatek.so|851cbecbf2c61bf4327a0326651e09fdb598a6e0
-
 # Radio
-vendor/bin/ccci_fsd
+vendor/bin/hw/mtkfusionrild
+vendor/bin/AgentTest
 vendor/bin/ccci_mdinit
 vendor/bin/ccci_rpcd
 vendor/bin/charon
 vendor/bin/epdg_wod
+vendor/bin/factory
 vendor/bin/gsm0710muxd
-vendor/bin/hw/mtkfusionrild
 vendor/bin/mnld
 vendor/bin/muxreport
 vendor/bin/starter
 vendor/bin/stp_dump3
 vendor/bin/stroke
-vendor/etc/apdb/APDB_MT6765_S01__W2109
-vendor/etc/apdb/APDB_MT6765_S01__W2109_ENUM
+vendor/etc/apdb/APDB_MT6765_S01__W2213
+vendor/etc/apdb/APDB_MT6765_S01__W2213_ENUM
+vendor/etc/init/gsm0710muxd.rc
+vendor/etc/init/init.cccimdinit.rc
+vendor/etc/init/init.cccirpcd.rc
+vendor/etc/init/init.md_apps.rc
+vendor/etc/init/mtkrild.rc
+vendor/etc/init/muxreport.rc
 vendor/etc/ecc_list.xml
 vendor/etc/ecc_list_OP01.xml
 vendor/etc/ecc_list_OP02.xml
@@ -1021,18 +1097,11 @@ vendor/etc/ecc_list_OP12.xml
 vendor/etc/ecc_list_OP17.xml
 vendor/etc/ecc_list_OP18.xml
 vendor/etc/ecc_list_OP20.xml
+vendor/etc/ecc_list_OP236.xml
 vendor/etc/ecc_list_preference.xml
 vendor/etc/factory.ini
-vendor/etc/init/gsm0710muxd.rc
-vendor/etc/init/init.cccifsd.rc
-vendor/etc/init/init.cccimdinit.rc
-vendor/etc/init/init.cccirpcd.rc
-vendor/etc/init/init.md_apps.rc
-vendor/etc/init/mtkrild.rc
-vendor/etc/init/muxreport.rc
 vendor/etc/smsdbvisitor.xml
 vendor/etc/special_pws_channel.xml
-vendor/etc/spn-conf-op09.xml
 vendor/etc/vendor-apns-conf.xml
 vendor/etc/virtual-spn-conf-by-efgid1.xml
 vendor/etc/virtual-spn-conf-by-efpnn.xml
@@ -1057,9 +1126,15 @@ vendor/lib/libmtkperf_client_vendor.so
 vendor/lib/libmtkproperty.so
 vendor/lib/libmtkrillog.so
 vendor/lib/libmtkshifter_vendor.so
+vendor/lib/libmtkspparser.so
 vendor/lib/libmtksysutils.so
+vendor/lib/libsimlock.so
+vendor/lib/libsimmelock.so
 vendor/lib/libssl-mdapp.so
 vendor/lib/libsysenv.so
+vendor/lib/libtranslator_mapi_v3.0.so
+vendor/lib/libtranslator_mdmi_v2.8.2.so
+vendor/lib/libtranslator_utils.so
 vendor/lib/libutinterface_custom_md.so
 vendor/lib/libutinterface_md.so
 vendor/lib64/libcares_naptr.so
@@ -1073,17 +1148,21 @@ vendor/lib64/libcvsd_mtk.so
 vendor/lib64/libhydra.so
 vendor/lib64/liblpcnr.so
 vendor/lib64/libmfllcore.so
+vendor/lib64/libmipc.so
 vendor/lib64/libmmprofile.so
 vendor/lib64/libmnetlink_v104.so
+vendor/lib64/libmnl.so
 vendor/lib64/libmsbc_mtk.so
 vendor/lib64/libmsnr.so
 vendor/lib64/libmtcloader.so
+vendor/lib64/libmtk-fusion-ril-prop-vsim.so
 vendor/lib64/libmtk-ril.so
 vendor/lib64/libmtkares.so
 vendor/lib64/libmtkconfig.so
 vendor/lib64/libmtkconfigutils.so
 vendor/lib64/libmtkcutils.so
 vendor/lib64/libmtkhardware_legacy.so
+vendor/lib64/libmtkmipc-ril.so
 vendor/lib64/libmtkproperty.so
 vendor/lib64/libmtkrillog.so
 vendor/lib64/libmtkrilutils.so
@@ -1091,11 +1170,19 @@ vendor/lib64/libmtkutils.so
 vendor/lib64/libratconfig.so
 vendor/lib64/librilfusion.so
 vendor/lib64/libsimaka.so
+vendor/lib64/libsimlock.so
+vendor/lib64/libsimmelock.so
 vendor/lib64/libssl-mdapp.so
 vendor/lib64/libstrongswan.so
 vendor/lib64/libsysenv.so
+vendor/lib64/libtranslator_mapi_v3.0.so
+vendor/lib64/libtranslator_mdmi_v2.8.2.so
+vendor/lib64/libtranslator_utils.so
 vendor/lib64/libutinterface_custom_md.so
 vendor/lib64/libutinterface_md.so
+vendor/lib64/libvia-ril.so
+vendor/lib64/libviamipc-ril.so
+vendor/lib64/vendor.mediatek.hardware.mtkradioex@3.0.so
 
 # Sensors
 vendor/bin/hw/android.hardware.sensors@2.0-service-mediatek
@@ -1121,33 +1208,41 @@ vendor/etc/.tp/.thermal_policy_03
 vendor/etc/.tp/.thermal_policy_05
 vendor/etc/.tp/thermal.conf
 vendor/etc/.tp/thermal.off.conf
-vendor/etc/fstb.cfg
 vendor/etc/init/android.hardware.thermal@2.0-service.mtk.rc
 vendor/etc/init/init.thermal.rc
 vendor/etc/init/init.thermal_manager.rc
 vendor/etc/init/init.thermalloadalgod.rc
+vendor/etc/fstb.cfg
+vendor/etc/task_profiles.json
 vendor/etc/throttle.sh
 vendor/lib/hw/android.hardware.thermal@2.0-impl.so
-vendor/lib/hw/thermal.mt6765.so
+vendor/lib/hw/thermal_hal.so
 vendor/lib/libthermalalgo.so
 vendor/lib64/hw/android.hardware.thermal@2.0-impl.so
-vendor/lib64/hw/thermal.mt6765.so
+vendor/lib64/hw/thermal_hal.so
 
 # USB
-vendor/bin/hw/android.hardware.usb@1.1-service-mediatekv2
-vendor/etc/init/android.hardware.usb@1.1-service-mediatekv2.rc
+vendor/bin/hw/android.hardware.usb@1.2-service-mediatekv2
+vendor/etc/init/android.hardware.usb@1.2-service-mediatekv2.rc
+vendor/etc/vintf/manifest/android.hardware.usb@1.2-service-mediatekv2.xml
 
 # Misc
+vendor/bin/chipinfo
 vendor/etc/init/bootperf.rc
+vendor/etc/init/chipinfo_init.rc
+vendor/lib/libdynamiclog.so
+vendor/lib64/libconnfem.so
 vendor/lib64/libforkexecwrap.so
 
 # Vibrator
 vendor/bin/hw/android.hardware.vibrator-service.mediatek
 vendor/etc/init/vibrator-mtk-default.rc
--vendor/etc/vintf/manifest/vibrator-mtk-default.xml
+vendor/etc/vintf/manifest/vibrator-mtk-default.xml
 
 # WiFi
+vendor/bin/hw/android.hardware.wifi@1.0-service
 vendor/bin/hw/hostapd
+vendor/bin/hw/tetheroffloadservice
 vendor/bin/hw/wpa_supplicant
 vendor/bin/netdagent
 vendor/bin/netdc
@@ -1156,6 +1251,7 @@ vendor/bin/wlan_assistant
 vendor/bin/wmt_launcher
 vendor/bin/wmt_loader
 vendor/etc/init/android.hardware.wifi.supplicant-service.rc
+vendor/etc/init/android.hardware.wifi@1.0-service.rc
 vendor/etc/init/hostapd.android.rc
 vendor/etc/init/init.wfca.rc
 vendor/etc/init/init.wlan_drv.rc
@@ -1163,16 +1259,28 @@ vendor/etc/init/init.wmt_drv.rc
 vendor/etc/init/init.wod.rc
 vendor/etc/init/netdagent.rc
 vendor/etc/init/networksetting.rc
+vendor/etc/init/tetheroffloadservice.rc
 vendor/etc/init/wlan_assistant.rc
--vendor/etc/vintf/manifest/android.hardware.wifi.hostapd.xml
+vendor/etc/vintf/manifest/android.hardware.wifi.hostapd.xml
+vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml
+vendor/etc/vintf/manifest/android.hardware.wifi@1.0-service.xml
+vendor/etc/wfd_source_capability.csv
+vendor/lib/libapmonitor_vendor.so
+vendor/lib/libwapi.so
 vendor/lib/libwo.so
 vendor/lib/libwpa_client.so
+vendor/lib/meta_wifi_data.so
+vendor/lib/vendor.mediatek.hardware.apmonitor@2.0.so
+vendor/lib/vendor.mediatek.hardware.mdmonitor@1.0.so
 vendor/lib/vendor.mediatek.hardware.netdagent@1.0.so
+vendor/lib64/libapmonitor_vendor.so
+vendor/lib64/libwapi.so
 vendor/lib64/libwifi-hal.so
 vendor/lib64/libwifitest.so
 vendor/lib64/libwo.so
 vendor/lib64/libwpa_client.so
+vendor/lib64/libwpfa.so
+vendor/lib64/meta_wifi_data.so
+vendor/lib64/vendor.mediatek.hardware.apmonitor@2.0.so
+vendor/lib64/vendor.mediatek.hardware.mdmonitor@1.0.so
 vendor/lib64/vendor.mediatek.hardware.netdagent@1.0.so
-vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.0.so
-vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.1.so
-vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.2.so
diff --git a/rootdir/Android.bp b/rootdir/Android.bp
index de056663ab2b41b678c7ad6d84eedfda10f9a7b1..ff22b0e3018fcfd7ed6d90caf5c11a353eb73076 100644
--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -10,6 +10,13 @@ prebuilt_etc {
     vendor: true,
 }
 
+prebuilt_etc {
+    name: "init.cgroup.rc",
+    src: "etc/init.cgroup.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
 prebuilt_etc {
     name: "init.connectivity.rc",
     src: "etc/init.connectivity.rc",
@@ -17,6 +24,20 @@ prebuilt_etc {
     vendor: true,
 }
 
+prebuilt_etc {
+    name: "init.connectivity.common.rc",
+    src: "etc/init.connectivity.common.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "init_connectivity.rc",
+    src: "etc/init_connectivity.rc",
+    sub_dir: "init/hw",
+    vendor: true,
+}
+
 prebuilt_etc {
     name: "init.modem.rc",
     src: "etc/init.modem.rc",
@@ -74,8 +95,8 @@ prebuilt_etc {
 }
 
 prebuilt_etc {
-    name: "init_connectivity.rc",
-    src: "etc/init_connectivity.rc",
-    sub_dir: "init",
+    name: "ueventd.mtk.rc",
+    filename: "ueventd.rc",
+    src: "etc/ueventd.mtk.rc",
     vendor: true,
-}
\ No newline at end of file
+}
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
deleted file mode 100644
index c38ee10397f27e84cb7f12ed647f543841e95371..0000000000000000000000000000000000000000
--- a/rootdir/Android.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := ueventd.mtk.rc
-LOCAL_MODULE_STEM  := ueventd.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/ueventd.mtk.rc
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR)
-include $(BUILD_PREBUILT)
\ No newline at end of file
diff --git a/rootdir/etc/init.cgroup.rc b/rootdir/etc/init.cgroup.rc
new file mode 100644
index 0000000000000000000000000000000000000000..81511de1c54d2ec38e0a5d2ef7c29365806959f7
--- /dev/null
+++ b/rootdir/etc/init.cgroup.rc
@@ -0,0 +1,71 @@
+
+on post-fs
+
+    # boot perf. tune
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/boot_boost "0 100"
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/boot_boost "1 100"
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/boot_boost "2 100"
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/boot_boost "3 100"
+
+on init
+
+ # Create energy-aware scheduler tuning nodes
+    mkdir /dev/stune/foreground
+    mkdir /dev/stune/background
+    mkdir /dev/stune/top-app
+    mkdir /dev/stune/rt
+    chown system system /dev/stune
+    chown system system /dev/stune/foreground
+    chown system system /dev/stune/background
+    chown system system /dev/stune/top-app
+    chown system system /dev/stune/rt
+    chown system system /dev/stune/tasks
+    chown system system /dev/stune/foreground/tasks
+    chown system system /dev/stune/background/tasks
+    chown system system /dev/stune/top-app/tasks
+    chown system system /dev/stune/rt/tasks
+    chmod 0664 /dev/stune/tasks
+    chmod 0664 /dev/stune/foreground/tasks
+    chmod 0664 /dev/stune/background/tasks
+    chmod 0664 /dev/stune/top-app/tasks
+    chmod 0664 /dev/stune/rt/tasks
+
+    # Reset stune group setting for NNAPI HAL processes
+    write /dev/stune/nnapi-hal/schedtune.boost 0
+    write /dev/stune/nnapi-hal/schedtune.prefer_idle 0
+
+    # create an stune group for camera-specific processes
+    mkdir /dev/stune/camera-daemon
+    write /dev/stune/camera-daemon/schedtune.prefer_idle 0
+    write /dev/stune/camera-daemon/schedtune.boost 0
+    chown system system /dev/stune/camera-daemon
+    chown system system /dev/stune/camera-daemon/tasks
+    chmod 0664 /dev/stune/camera-daemon/tasks
+
+    # create io boost group
+    mkdir /dev/stune/io
+    chown system system /dev/stune/io
+    chown system system /dev/stune/io/tasks
+    chmod 0666 /dev/stune/io/tasks
+
+on property:sys.boot_completed=1
+
+    write /sys/devices/system/cpu/eas/enable 2
+    write /proc/cpufreq/cpufreq_sched_disable 0
+
+    chown system system /dev/stune/foreground/schedtune.prefer_idle
+    chown system system /dev/stune/top-app/schedtune.prefer_idle
+    chown system system /dev/stune/rt/schedtune.prefer_idle
+    write /dev/stune/foreground/schedtune.prefer_idle 0
+    write /dev/stune/top-app/schedtune.prefer_idle 0
+    write /dev/stune/rt/schedtune.prefer_idle 0
+    write /proc/sys/kernel/sched_migration_cost_ns 200000
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/sched_big_task_rotation 1
+
+    # restore perf. parameters
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/boot_boost "0 0"
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/boot_boost "1 0"
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/boot_boost "2 0"
+    write /proc/perfmgr/boost_ctrl/eas_ctrl/boot_boost "3 0"
+    write /proc/perfmgr/boost_ctrl/cpu_ctrl/boot_freq "-1 -1 -1 -1 -1 -1"
+    write /sys/devices/platform/boot_dramboost/dramboost/dramboost 0
\ No newline at end of file
diff --git a/rootdir/etc/init.connectivity.common.rc b/rootdir/etc/init.connectivity.common.rc
new file mode 100644
index 0000000000000000000000000000000000000000..550029bbce8796e259bec2bf468ddcdb75d945c7
--- /dev/null
+++ b/rootdir/etc/init.connectivity.common.rc
@@ -0,0 +1,83 @@
+# MTK connectivity .rc configure
+
+on post-fs-data
+
+
+#
+# Connectivity related device nodes & configuration (begin)
+#
+
+#/dev/ttyMT2 for Connectivity BT/FM/GPS usage
+    chmod 0660 /dev/ttyMT2
+    chown system system /dev/ttyMT2
+
+#/dev/ttyMT1 for GPS 3337 usage
+    chmod 0660 /dev/ttyMT1
+    chown system system /dev/ttyMT1
+
+# GPS
+    mkdir /data/vendor/gps 0770 gps system
+    mkdir /data/vendor/log 0770 gps system
+    mkdir /data/vendor/log/gps 0770 gps system
+
+# GPS EMI
+    chmod 0660 /dev/gps_emi
+
+# WiFi
+    mkdir /data/vendor/wifi 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
+
+# BT relayer mode used VCOM
+    chown bluetooth bluetooth /dev/ttyGS2
+    chmod 0660 /dev/ttyGS2
+
+#
+# Connectivity related device nodes & configuration (end)
+#
+
+
+on boot
+
+#
+# Connectivity related services (Begin)
+#
+# GPS
+service mnld /vendor/bin/mnld
+    class main
+    user gps
+    capabilities WAKE_ALARM
+    group gps inet misc sdcard_rw sdcard_r media_rw system radio wakelock
+    socket mnld stream 660 gps system
+
+# GPS Debug Process
+service lbs_dbg /system/bin/lbs_dbg
+    class main
+    user shell
+    group log system gps inet misc sdcard_rw sdcard_r media_rw radio
+    socket lbs_dbg stream 660 gps system
+
+on property:persist.vendor.em.dy.debug=1
+    stop lbs_dbg
+
+#service BGW /vendor/bin/BGW
+#    user system
+#    group gps system radio
+#    class main
+
+# Wlan
+#service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
+#    -g@android:wpa_wlan0
+#    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
+#    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
+#    interface android.hardware.wifi.supplicant@1.2::ISupplicant default
+#    interface android.hardware.wifi.supplicant@1.3::ISupplicant default
+#    socket wpa_wlan0 dgram 660 wifi wifi
+#    class main
+#    disabled
+#    oneshot
+
+#
+# Connectivity related services (End)
+#
+
diff --git a/rootdir/etc/init.connectivity.rc b/rootdir/etc/init.connectivity.rc
index 550029bbce8796e259bec2bf468ddcdb75d945c7..08b3a5157191a5d21fb4028ffcdb3414abc4c97b 100644
--- a/rootdir/etc/init.connectivity.rc
+++ b/rootdir/etc/init.connectivity.rc
@@ -1,83 +1,4 @@
 # MTK connectivity .rc configure
 
-on post-fs-data
-
-
-#
-# Connectivity related device nodes & configuration (begin)
-#
-
-#/dev/ttyMT2 for Connectivity BT/FM/GPS usage
-    chmod 0660 /dev/ttyMT2
-    chown system system /dev/ttyMT2
-
-#/dev/ttyMT1 for GPS 3337 usage
-    chmod 0660 /dev/ttyMT1
-    chown system system /dev/ttyMT1
-
-# GPS
-    mkdir /data/vendor/gps 0770 gps system
-    mkdir /data/vendor/log 0770 gps system
-    mkdir /data/vendor/log/gps 0770 gps system
-
-# GPS EMI
-    chmod 0660 /dev/gps_emi
-
-# WiFi
-    mkdir /data/vendor/wifi 0770 wifi wifi
-    mkdir /data/vendor/wifi/wpa 0770 wifi wifi
-    mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
-
-# BT relayer mode used VCOM
-    chown bluetooth bluetooth /dev/ttyGS2
-    chmod 0660 /dev/ttyGS2
-
-#
-# Connectivity related device nodes & configuration (end)
-#
-
-
-on boot
-
-#
-# Connectivity related services (Begin)
-#
-# GPS
-service mnld /vendor/bin/mnld
-    class main
-    user gps
-    capabilities WAKE_ALARM
-    group gps inet misc sdcard_rw sdcard_r media_rw system radio wakelock
-    socket mnld stream 660 gps system
-
-# GPS Debug Process
-service lbs_dbg /system/bin/lbs_dbg
-    class main
-    user shell
-    group log system gps inet misc sdcard_rw sdcard_r media_rw radio
-    socket lbs_dbg stream 660 gps system
-
-on property:persist.vendor.em.dy.debug=1
-    stop lbs_dbg
-
-#service BGW /vendor/bin/BGW
-#    user system
-#    group gps system radio
-#    class main
-
-# Wlan
-#service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-#    -g@android:wpa_wlan0
-#    interface android.hardware.wifi.supplicant@1.0::ISupplicant default
-#    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
-#    interface android.hardware.wifi.supplicant@1.2::ISupplicant default
-#    interface android.hardware.wifi.supplicant@1.3::ISupplicant default
-#    socket wpa_wlan0 dgram 660 wifi wifi
-#    class main
-#    disabled
-#    oneshot
-
-#
-# Connectivity related services (End)
-#
-
+import /vendor/etc/init/hw/init_connectivity.rc
+import /vendor/etc/init/hw/init.connectivity.common.rc
diff --git a/rootdir/etc/init.mt6765.rc b/rootdir/etc/init.mt6765.rc
index ebc4fc410b84d212e224141eed74474aafd20d46..9a7c5a9abfb01cf5d716bace9cd455d726ee12f0 100644
--- a/rootdir/etc/init.mt6765.rc
+++ b/rootdir/etc/init.mt6765.rc
@@ -4,14 +4,13 @@ import /vendor/etc/init/hw/init.connectivity.rc
 import /vendor/etc/init/hw/init.mt6765.usb.rc
 import /vendor/etc/init/hw/init.project.rc
 import /FWUpgradeInit.rc
+import /vendor/etc/init/hw/init.aee.rc
+import /system_ext/etc/init/hw/init.aee.rc
 import /vendor/etc/init/hw/init.volte.rc
 import /vendor/etc/init/hw/init.mal.rc
 import /vendor/etc/init/hw/init.sensor_1_0.rc
 import /vendor/etc/init/hw/init.ago.rc
 
-import /vendor/etc/init/hw/init.stnfc.rc
-import /system/etc/init/hw/init.stnfc.rc
-
 # init.modem.rc must be the LAST rc file because vold.post_fs_data_done is set in it
 import /vendor/etc/init/hw/init.modem.rc
 # *** DO NOT import the new rc file after this line ***
@@ -153,16 +152,12 @@ on post-fs
     chown radio system /proc/freqhopping/status
     chown radio system /proc/freqhopping/userdef
 
-    #hzr add for battery charging limit
-    chmod 0666 /sys/bus/platform/drivers/mtk-kpd/stop_charging_percent
-
     # Support A/B feature for emmc boot region
     symlink /dev/block/sda /dev/block/mmcblk0boot0
     symlink /dev/block/sdb /dev/block/mmcblk0boot1
     symlink /dev/block/mmcblk0boot0 /dev/block/platform/bootdevice/by-name/preloader_a
     symlink /dev/block/mmcblk0boot1 /dev/block/platform/bootdevice/by-name/preloader_b
 
-    # light add
     chmod 0666 /sys/bus/platform/drivers/mtk-kpd/kpd_tp_gesture_state
 
 # change owner
@@ -180,7 +175,6 @@ on post-fs
 on late-fs
     write /proc/bootprof "INIT:late-fs"
     wait_for_prop hwservicemanager.ready "true"
-    exec_start wait_for_keymaster
 
     write /proc/bootprof "INIT:Mount_START --late"
     write /sys/kernel/tracing/trace_marker "B|1|Mount late"
@@ -250,7 +244,7 @@ on post-fs-data
     mkdir /data/vendor/dipdebug
     chown root system /data/vendor/dipdebug
     chmod 0771 /data/vendor/dipdebug
-    
+
     #Create flicker mount point
     mkdir /data/vendor/flicker
     chown root system /data/vendor/flicker
@@ -326,6 +320,8 @@ on post-fs-data
     #insmod /vendor/lib/modules/m4u.ko
     chmod 0444 /dev/m4u
     #chown system media /dev/M4U_device
+    chmod 0640 /proc/m4u
+    chown system media /proc/m4u
 
     #set mlock to 64MB for netd
     setrlimit 8 67108864 67108864
@@ -366,6 +362,7 @@ on post-fs-data
     #insmod /vendor/lib/modules/vcodec_kernel_driver.ko
     chmod 0666 /dev/Vcodec
     chown media system /dev/Vcodec
+    mkdir /data/vendor/vcodec 0777 media system
 
     #MJC
     #insmod /vendor/lib/modules/mjc_kernel_driver.ko
@@ -657,6 +654,7 @@ on zygote-start
 
 on early-boot
     write /proc/bootprof "INIT:early-boot"
+    verity_update_state
 
 on boot
     write /proc/bootprof "INIT:boot"
@@ -874,7 +872,7 @@ on boot
     chown system system /proc/perfmgr/boost_ctrl/dram_ctrl/ddr
     chmod 0660 /proc/perfmgr/boost_ctrl/eas_ctrl/dram_ctrl/ddr
 
- 
+
 ##Netlog tool
    #change permissions about terminal
     chown root radio /proc/net/vlan/config
@@ -1055,18 +1053,29 @@ on property:persist.vendor.mediatek.fg.log.enable=1
 
 # add meta_tst for ATM
 service meta_tst /vendor/bin/meta_tst
-    class main
-    user system
+    class core
+    user root
     group radio gps system wifi audio bluetooth media
     capabilities NET_RAW NET_ADMIN
-
+    socket meta-atci stream 660 radio system
     disabled
     oneshot
 
+service factory_no_image /vendor/bin/factory
+    user root
+    group radio system wifi media gps audio bluetooth wakelock nfc
+    capabilities BLOCK_SUSPEND NET_RAW NET_ADMIN SYS_ADMIN SYS_BOOT
+    socket factory-atci stream 660 radio system
+    disabled
+    oneshot	
+
 # start meta_tst for ATM
 on property:sys.boot_completed=1 && property:ro.boot.atm=enable
     start meta_tst
 
+# reset mdmode when modem crash happens in ATM
+on property:vendor.mtk.md1.status=reset
+    setprop persist.vendor.atm.mdmode normal
 
 on init
     symlink /dev/block/platform/bootdevice /dev/block/bootdevice
@@ -1082,5 +1091,3 @@ service osi /system/bin/osi
     disabled
     oneshot
     #seclabel u:r:osi:s0
-
-
diff --git a/rootdir/etc/init.mt6765.usb.rc b/rootdir/etc/init.mt6765.usb.rc
index 41db120740b52c66748c985b592436398f99dd57..f002fbc6baa99d6b4b70c96089a568789d9eb3e1 100644
--- a/rootdir/etc/init.mt6765.usb.rc
+++ b/rootdir/etc/init.mt6765.usb.rc
@@ -3,7 +3,7 @@ on early-init
 
 on post-fs
     setprop vendor.usb.vid "0x0E8D"
-    mkdir /dev/usb-ffs 0770 shell shell
+    mkdir /dev/usb-ffs 0775 shell shell
     mkdir /dev/usb-ffs/adb 0770 shell shell
     mkdir /config/usb_gadget/g1 0770 shell shell
     write /config/usb_gadget/g1/idVendor ${vendor.usb.vid}
@@ -17,9 +17,9 @@ on post-fs
     mkdir /config/usb_gadget/g1/functions/accessory.gs2
     mkdir /config/usb_gadget/g1/functions/audio_source.gs3
     mkdir /config/usb_gadget/g1/functions/ffs.adb
-    mkdir /config/usb_gadget/g1/functions/mtp.gs0
-    write /config/usb_gadget/g1/functions/mtp.gs0/os_desc/interface.MTP/compatible_id "MTP"
-    mkdir /config/usb_gadget/g1/functions/ptp.gs1
+    mkdir /config/usb_gadget/g1/functions/ffs.mtp
+    write /config/usb_gadget/g1/functions/ffs.mtp/os_desc/interface.MTP/compatible_id "MTP"
+    mkdir /config/usb_gadget/g1/functions/ffs.ptp
     mkdir /config/usb_gadget/g1/functions/rndis.gs4
     mkdir /config/usb_gadget/g1/functions/midi.gs5
     mkdir /config/usb_gadget/g1/functions/acm.gs0
@@ -37,7 +37,11 @@ on post-fs
     write /config/usb_gadget/g1/os_desc/qw_sign "MSFT100"
     write /config/usb_gadget/g1/configs/b.1/MaxPower 500
     symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
-    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+    mount functionfs adb /dev/usb-ffs/adb rmode=0770,fmode=0660,uid=2000,gid=2000,no_disconnect=1
+    mkdir /dev/usb-ffs/mtp 0770 mtp mtp
+    mkdir /dev/usb-ffs/ptp 0770 mtp mtp
+    mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
+    mount functionfs ptp /dev/usb-ffs/ptp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
 
 on boot
     setprop sys.usb.configfs 1
@@ -156,23 +160,23 @@ property:sys.usb.configfs=1
     setprop vendor.usb.pid 0x202A
 
 on property:sys.usb.config=mtp && property:vendor.usb.acm_enable=1 && \
-property:sys.usb.configfs=1
+property:sys.usb.configfs=1 && property:vendor.usb.ffs.mtp.ready=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp_acm"
     write /config/usb_gadget/g1/idProduct ${vendor.usb.pid}
     write /config/usb_gadget/g1/os_desc/use 1
     write /sys/devices/platform/mt_usb/saving 1
-    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/acm.gs${vendor.usb.acm_port0} /config/usb_gadget/g1/configs/b.1/f2
     symlink /config/usb_gadget/g1/functions/acm.gs${vendor.usb.acm_port1} /config/usb_gadget/g1/configs/b.1/f3
     write /config/usb_gadget/g1/UDC ${vendor.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=mtp && property:vendor.usb.acm_enable=0 && \
-property:sys.usb.configfs=1
+property:sys.usb.configfs=1 && property:vendor.usb.ffs.mtp.ready=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp"
     write /config/usb_gadget/g1/idProduct ${vendor.usb.pid}
     write /config/usb_gadget/g1/os_desc/use 1
-    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
     write /config/usb_gadget/g1/UDC ${vendor.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
 
@@ -189,12 +193,12 @@ property:sys.usb.configfs=1
     setprop vendor.usb.pid 0x2026
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && \
-property:vendor.usb.acm_enable=1 && property:sys.usb.configfs=1
+property:vendor.usb.acm_enable=1 && property:sys.usb.configfs=1 && property:vendor.usb.ffs.mtp.ready=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp_adb_acm"
     write /config/usb_gadget/g1/idProduct ${vendor.usb.pid}
     write /config/usb_gadget/g1/os_desc/use 1
     write /sys/devices/platform/mt_usb/saving 1
-    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
     symlink /config/usb_gadget/g1/functions/acm.gs${vendor.usb.acm_port0} /config/usb_gadget/g1/configs/b.1/f3
     symlink /config/usb_gadget/g1/functions/acm.gs${vendor.usb.acm_port1} /config/usb_gadget/g1/configs/b.1/f4
@@ -202,11 +206,11 @@ property:vendor.usb.acm_enable=1 && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && \
-property:vendor.usb.acm_enable=0 && property:sys.usb.configfs=1
+property:vendor.usb.acm_enable=0 && property:sys.usb.configfs=1 && property:vendor.usb.ffs.mtp.ready=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp_adb"
     write /config/usb_gadget/g1/idProduct ${vendor.usb.pid}
     write /config/usb_gadget/g1/os_desc/use 1
-    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
     write /config/usb_gadget/g1/UDC ${vendor.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
@@ -224,21 +228,21 @@ property:sys.usb.configfs=1
     setprop vendor.usb.pid 0x202B
 
 on property:sys.usb.config=ptp && property:vendor.usb.acm_enable=1 && \
-property:sys.usb.configfs=1
+property:sys.usb.configfs=1 && property:vendor.usb.ffs.ptp.ready=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp_acm"
     write /config/usb_gadget/g1/idProduct ${vendor.usb.pid}
     write /sys/devices/platform/mt_usb/saving 1
-    symlink /config/usb_gadget/g1/functions/ptp.gs1 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/acm.gs${vendor.usb.acm_port0} /config/usb_gadget/g1/configs/b.1/f2
     symlink /config/usb_gadget/g1/functions/acm.gs${vendor.usb.acm_port1} /config/usb_gadget/g1/configs/b.1/f3
     write /config/usb_gadget/g1/UDC ${vendor.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.config=ptp && property:vendor.usb.acm_enable=0 && \
-property:sys.usb.configfs=1
+property:sys.usb.configfs=1 && property:vendor.usb.ffs.ptp.ready=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp"
     write /config/usb_gadget/g1/idProduct ${vendor.usb.pid}
-    symlink /config/usb_gadget/g1/functions/ptp.gs1 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1
     write /config/usb_gadget/g1/UDC ${vendor.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
 
@@ -255,11 +259,11 @@ property:sys.usb.configfs=1
     setprop vendor.usb.pid 0x2027
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ptp,adb && \
-property:vendor.usb.acm_enable=1 && property:sys.usb.configfs=1
+property:vendor.usb.acm_enable=1 && property:sys.usb.configfs=1 && property:vendor.usb.ffs.ptp.ready=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp_adb_acm"
     write /config/usb_gadget/g1/idProduct ${vendor.usb.pid}
     write /sys/devices/platform/mt_usb/saving 1
-    symlink /config/usb_gadget/g1/functions/ptp.gs1 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
     symlink /config/usb_gadget/g1/functions/acm.gs${vendor.usb.acm_port0} /config/usb_gadget/g1/configs/b.1/f3
     symlink /config/usb_gadget/g1/functions/acm.gs${vendor.usb.acm_port1} /config/usb_gadget/g1/configs/b.1/f4
@@ -267,10 +271,10 @@ property:vendor.usb.acm_enable=1 && property:sys.usb.configfs=1
     setprop sys.usb.state ${sys.usb.config}
 
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ptp,adb && \
-property:vendor.usb.acm_enable=0 && property:sys.usb.configfs=1
+property:vendor.usb.acm_enable=0 && property:sys.usb.configfs=1 && property:vendor.usb.ffs.ptp.ready=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp_adb"
     write /config/usb_gadget/g1/idProduct ${vendor.usb.pid}
-    symlink /config/usb_gadget/g1/functions/ptp.gs1 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.ptp /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
     write /config/usb_gadget/g1/UDC ${vendor.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
@@ -682,6 +686,8 @@ on property:sys.usb.config=acm_gs0gs1
     setprop sys.usb.config ${sys.usb.state}
     setprop vendor.usb.acm_idx "1,2"
 
+on property:persist.vendor.radio.port_index=1,4 && property:sys.boot_completed=1
+    setprop sys.usb.config acm_gs0gs3
 on property:sys.usb.config=gs3,dual_acm
     setprop sys.usb.config acm_gs0gs3
 on property:sys.usb.config=mtp,gs3,dual_acm
@@ -721,7 +727,7 @@ on property:sys.usb.config=acm_gs1gs3
     setprop vendor.usb.acm_idx "2,4"
 
 # For ATM (Android Test Mode)
-on property:vendor.usb.clear=1 && property:sys.usb.configfs=1
+on property:vendor.usb.clear=1 && property:sys.usb.configfs=1 && property:sys.usb.ffs.ready=0
     write /config/usb_gadget/g1/UDC "none"
     write /config/usb_gadget/g1/bDeviceClass 0
     write /config/usb_gadget/g1/bDeviceSubClass 0
@@ -759,7 +765,7 @@ property:vendor.usb.clear=2 && property:sys.usb.configfs=1
     write /sys/class/udc/musb-hdrc/device/saving 1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "atm_gs0"
     write /config/usb_gadget/g1/idProduct 0x200A
-    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
     symlink /config/usb_gadget/g1/functions/acm.gs0 /config/usb_gadget/g1/configs/b.1/f3
     write /config/usb_gadget/g1/UDC ${vendor.usb.controller}
@@ -785,7 +791,7 @@ property:vendor.usb.clear=2 && property:sys.usb.configfs=1
     setprop vendor.usb.acm_enable 1
     write /sys/class/udc/musb-hdrc/device/saving 1
     write /config/usb_gadget/g1/idProduct 0x2026
-    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
     symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2
     symlink /config/usb_gadget/g1/functions/acm.gs0 /config/usb_gadget/g1/configs/b.1/f3
     symlink /config/usb_gadget/g1/functions/acm.gs3 /config/usb_gadget/g1/configs/b.1/f4
@@ -800,7 +806,7 @@ on property:sys.usb.config=cdp && property:sys.usb.configfs=1
     write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp"
     write /config/usb_gadget/g1/idProduct 0x2008
     write /config/usb_gadget/g1/os_desc/use 1
-    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1
+    symlink /config/usb_gadget/g1/functions/ffs.mtp /config/usb_gadget/g1/configs/b.1/f1
     write /config/usb_gadget/g1/UDC ${vendor.usb.controller}
     setprop sys.usb.state ${sys.usb.config}
     setprop vendor.usb.pid 0x2008
@@ -818,7 +824,7 @@ on property:sys.usb.config=charging_no
     setprop vendor.usb.charging no
 
 on property:vendor.usb.charging=yes
-    write /sys/class/udc/musb-hdrc/device/cmode 2
+    write /sys/class/udc/musb-hdrc/device/cmode 0
 on property:vendor.usb.charging=no
     write /sys/class/udc/musb-hdrc/device/cmode 1
 
@@ -834,18 +840,14 @@ on property:vendor.usb.port.mode=usb
 on property:vendor.usb.port.mode=uart
 	write /sys/devices/platform/mt_usb/portmode 1
 
-on property:vendor.em.usb.set=USB_DRIVING_CAPABILITY
-	write /sys/kernel/debug/usb20_phy/USB_DRIVING_CAPABILITY ${mediatek.em.usb.value}
-on property:vendor.em.usb.set=RG_USB20_TERM_VREF_SEL
-	write /sys/kernel/debug/usb20_phy/RG_USB20_TERM_VREF_SEL ${mediatek.em.usb.value}
-on property:vendor.em.usb.set=RG_USB20_HSTX_SRCTRL
-	write /sys/kernel/debug/usb20_phy/RG_USB20_HSTX_SRCTRL ${mediatek.em.usb.value}
-on property:vendor.em.usb.set=RG_USB20_VRT_VREF_SEL
-	write /sys/kernel/debug/usb20_phy/RG_USB20_VRT_VREF_SEL ${mediatek.em.usb.value}
-on property:vendor.em.usb.set=RG_USB20_INTR_EN
-	write /sys/kernel/debug/usb20_phy/RG_USB20_INTR_EN ${mediatek.em.usb.value}
-on property:vendor.em.usb.set=RG_USB20_PHY_REV6
-	write /sys/kernel/debug/usb20_phy/RG_USB20_PHY_REV6 ${mediatek.em.usb.value}
+on property:vendor.em.usb.set=term_sel
+	write /proc/mtk_usb/usb-phy0/u2_phy/term_sel ${vendor.em.usb.value}
+on property:vendor.em.usb.set=vrt_sel
+	write /proc/mtk_usb/usb-phy0/u2_phy/vrt_sel ${vendor.em.usb.value}
+on property:vendor.em.usb.set=phy_rev6
+	write /proc/mtk_usb/usb-phy0/u2_phy/phy_rev6 ${vendor.em.usb.value}
+on property:vendor.em.usb.set=discth
+	write /proc/mtk_usb/usb-phy0/u2_phy/discth ${vendor.em.usb.value}
 
 on property:vendor.em.usb.bypass.enable=0
 	write /sys/class/usb_rawbulk/gps/enable 1
@@ -885,4 +887,14 @@ on property:vendor.usb.printk=*
 on property:persist.vendor.usb.printk=*
 	setprop vendor.usb.printk ${persist.vendor.usb.printk}
 
+on property:vendor.usb.testmode=0
+	write /proc/mtk_usb/testmode "0"
+on property:vendor.usb.testmode=1
+	write /proc/mtk_usb/testmode "test SE0 NAK"
+on property:vendor.usb.testmode=2
+	write /proc/mtk_usb/testmode "test J"
+on property:vendor.usb.testmode=3
+	write /proc/mtk_usb/testmode "test K"
+on property:vendor.usb.testmode=4
+	write /proc/mtk_usb/testmode "test packet"
 ### PLATFORM VARIANT, cat $rc_file | grep write | sort | grep -vE "android0|usb20_phy" | awk '{print $2}' | uniq ###
diff --git a/rootdir/etc/init_connectivity.rc b/rootdir/etc/init_connectivity.rc
index b554c0f29a9a980438ecf4254233a95a9868cab7..5786763ad329b1f379585943f4924f8bdc08711e 100644
--- a/rootdir/etc/init_connectivity.rc
+++ b/rootdir/etc/init_connectivity.rc
@@ -23,22 +23,15 @@ on property:ro.build.type=eng
 
 on property:persist.vendor.connsys.coredump.mode=1
     start stp_dump
-    start bt_dump
-    start wifi_dump
 
 on property:persist.vendor.connsys.coredump.mode=2
     start stp_dump
-    start bt_dump
-    start wifi_dump
 
 on property:persist.vendor.connsys.coredump.mode=0
     stop stp_dump
-    stop bt_dump
-    stop wifi_dump
 
 on property:vendor.connsys.driver.ready=yes && property:persist.vendor.connsys.coredump.mode=*
     write /proc/driver/wmt_user_proc "0x1 ${persist.vendor.connsys.coredump.mode}"
-    write /proc/driver/conninfra_dbg "0x13 ${persist.vendor.connsys.coredump.mode}"
 
 on property:vendor.connsys.driver.ready=yes && property:debug.vendor.connsys.suspend.alarm=*
     write /proc/driver/wmt_user_proc "0x2 ${debug.vendor.connsys.suspend.alarm}"
@@ -51,15 +44,3 @@ service stp_dump /vendor/bin/stp_dump3
     group system sdcard_rw misc
     class core
     disabled
-
-service bt_dump /vendor/bin/bt_dump
-    user system
-    group system sdcard_rw misc
-    class core
-    disabled
-
-service wifi_dump /vendor/bin/wifi_dump
-    user system
-    group system sdcard_rw misc
-    class core
-    disabled
\ No newline at end of file
diff --git a/rootdir/etc/ueventd.mtk.rc b/rootdir/etc/ueventd.mtk.rc
index 4d868ff02fde1844b4c512e2c6859db602cc045b..3af26b053e86902732f8d9d2f1ddcfcd5f6d08c3 100644
--- a/rootdir/etc/ueventd.mtk.rc
+++ b/rootdir/etc/ueventd.mtk.rc
@@ -91,6 +91,7 @@
 /dev/ccci3_raw_audio      0660   audio      audio
 /dev/eemcs_aud            0660   audio      audio
 /dev/irtx                 0660   system     system
+/dev/lirc*                0660   root       system
 /dev/ir-learning          0660   system     system
 # SGX device node
 /dev/pvrsrvkm             0666   root       root
@@ -100,9 +101,9 @@
 /sys/devices/platform/leds-mt65xx/leds/green   delay_on      0664  system   system
 /sys/devices/platform/leds-mt65xx/leds/green   delay_off      0664  system   system
 /sys/devices/platform/leds-mt65xx/leds/red   delay_on      0664  system   system
-/sys/devices/platform/leds-mt65xx/leds/red   delay_off      0664  system   system
 /sys/devices/platform/leds-mt65xx/leds/red   tr1      0664  system   system
 /sys/devices/platform/leds-mt65xx/leds/red   toff      0664  system   system
+/sys/devices/platform/leds-mt65xx/leds/red   delay_off      0664  system   system
 /sys/devices/platform/leds-mt65xx/leds/blue   delay_on      0664  system   system
 /sys/devices/platform/leds-mt65xx/leds/blue   delay_off      0664  system   system
 /sys/class/leds/green   delay_on      0664  system   system
diff --git a/sepolicy/vendor/hal_audio_default.te b/sepolicy/vendor/hal_audio_default.te
index 31718e52d3c40ef9ad0d83e33f15a104101bd886..a41266f335d5c2f842cd9b902e4a90848495a581 100644
--- a/sepolicy/vendor/hal_audio_default.te
+++ b/sepolicy/vendor/hal_audio_default.te
@@ -8,6 +8,7 @@ allow hal_audio_default init:unix_stream_socket connectto;
 allow hal_audio_default adsp_device:chr_file rw_file_perms;
 allow hal_audio_default audio_ipi_device:chr_file rw_file_perms;
 allow hal_audio_default ccci_device:chr_file rw_file_perms;
+allow hal_audio_default ccci_aud_device:chr_file rw_file_perms;
 allow hal_audio_default ebc_device:chr_file rw_file_perms;
 allow hal_audio_default vow_device:chr_file rw_file_perms;
 
diff --git a/shims/Android.bp b/shims/Android.bp
deleted file mode 100644
index 6282f32c32e07499f3d2ec064c296870391ab764..0000000000000000000000000000000000000000
--- a/shims/Android.bp
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (C) 2021 The LineageOS Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-cc_library_shared {
-    name: "libshim_vtservice",
-    srcs: ["libshim_vtservice.cpp"],
-    compile_multilib: "32",
-    shared_libs: [
-        "libaudioclient",
-        "libgui",
-        "libstagefright",
-        "libutils",
-    ],
-    header_libs: [
-        "libaudioclient_headers",
-        "libmedia_headers",
-        "libmediametrics_headers",
-    ],
-}
-
-cc_library_shared {
-    name: "libshim_showlogo",
-    srcs: ["libshim_showlogo.cpp"],
-    shared_libs: [
-        "libgui",
-        "libutils",
-    ],
-    local_include_dirs: ["include"]
-}
diff --git a/shims/include/DisplayConfig.h b/shims/include/DisplayConfig.h
deleted file mode 100644
index 3cd26874b023634f7ecbf37c699575ede0148546..0000000000000000000000000000000000000000
--- a/shims/include/DisplayConfig.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <type_traits>
-
-#include <ui/Size.h>
-#include <utils/Timers.h>
-
-namespace android {
-
-// Configuration supported by physical display.
-struct DisplayConfig {
-    ui::Size resolution;
-    float xDpi = 0;
-    float yDpi = 0;
-
-    float refreshRate = 0;
-    nsecs_t appVsyncOffset = 0;
-    nsecs_t sfVsyncOffset = 0;
-    nsecs_t presentationDeadline = 0;
-    int configGroup = -1;
-};
-
-} // namespace android
diff --git a/shims/libshim_showlogo.cpp b/shims/libshim_showlogo.cpp
deleted file mode 100644
index f659b2bf6f870fe114550a6e2cf57d8c17a35260..0000000000000000000000000000000000000000
--- a/shims/libshim_showlogo.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <DisplayConfig.h>
-#include <gui/SurfaceComposerClient.h>
-
-using namespace android;
-
-extern "C" {
-
-void _ZN7android21SurfaceComposerClient13createSurfaceERKNS_7String8EjjijRKNS_2spINS_7IBinderEEENS_13LayerMetadataEPj(
-    const String8 &name, uint32_t w, uint32_t h, PixelFormat format,
-    uint32_t flags, const sp<IBinder> &parentHandle, LayerMetadata metadata,
-    uint32_t *outTransformHint);
-
-void _ZN7android21SurfaceComposerClient13createSurfaceERKNS_7String8EjjijPNS_14SurfaceControlENS_13LayerMetadataEPj(
-    const String8 &name, uint32_t w, uint32_t h, PixelFormat format,
-    uint32_t flags, SurfaceControl *parent, LayerMetadata metadata,
-    uint32_t *outTransformHint) {
-  _ZN7android21SurfaceComposerClient13createSurfaceERKNS_7String8EjjijRKNS_2spINS_7IBinderEEENS_13LayerMetadataEPj(
-      name, w, h, format, flags, nullptr, metadata, nullptr);
-}
-
-void _ZN7android14SurfaceControl10getSurfaceEv(void);
-
-void _ZNK7android14SurfaceControl10getSurfaceEv(void) {
-  _ZN7android14SurfaceControl10getSurfaceEv();
-}
-
-status_t
-_ZN7android21SurfaceComposerClient20getActiveDisplayModeERKNS_2spINS_7IBinderEEEPNS_2ui11DisplayModeE(
-    const sp<IBinder> &display, ui::DisplayMode *mode);
-
-status_t
-_ZN7android21SurfaceComposerClient22getActiveDisplayConfigERKNS_2spINS_7IBinderEEEPNS_13DisplayConfigE(
-    const sp<IBinder> &display, DisplayConfig *config) {
-  return _ZN7android21SurfaceComposerClient20getActiveDisplayModeERKNS_2spINS_7IBinderEEEPNS_2ui11DisplayModeE(
-      display, (ui::DisplayMode *)config);
-}
-}
diff --git a/shims/libshim_vtservice.cpp b/shims/libshim_vtservice.cpp
deleted file mode 100644
index 9347f1a9e06d10345f7c6587a096122653b28869..0000000000000000000000000000000000000000
--- a/shims/libshim_vtservice.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <gui/SurfaceComposerClient.h>
-#include <media/AudioTrack.h>
-#include <media/stagefright/MediaMuxer.h>
-
-using namespace android;
-
-extern "C" {
-void _ZN7android10AudioTrackC1E19audio_stream_type_tj14audio_format_t20audio_channel_mask_tj20audio_output_flags_tPFviPvS5_ES5_i15audio_session_tNS0_13transfer_typeEPK20audio_offload_info_tRKNS_7content22AttributionSourceStateEPK18audio_attributes_tbfi(
-        void* thisptr,
-        audio_stream_type_t streamType,
-        uint32_t sampleRate,
-        audio_format_t format,
-        audio_channel_mask_t channelMask,
-        size_t frameCount,
-        audio_output_flags_t flags,
-        android::AudioTrack::callback_t cbf,
-        void* user,
-        int32_t notificationFrames,
-        audio_session_t sessionId,
-        android::AudioTrack::transfer_type transferType,
-        const audio_offload_info_t *offloadInfo,
-        const AttributionSourceState& attributionSource,
-        const audio_attributes_t* pAttributes,
-        bool doNotReconnect,
-        float maxRequiredSpeed,
-        audio_port_handle_t selectedDeviceId);
-
-void _ZN7android10AudioTrackC1E19audio_stream_type_tj14audio_format_tjj20audio_output_flags_tPFviPvS4_ES4_i15audio_session_tNS0_13transfer_typeEPK20audio_offload_info_tjiPK18audio_attributes_tbfi(
-        void* thisptr,
-        audio_stream_type_t streamType,
-        uint32_t sampleRate,
-        audio_format_t format,
-        audio_channel_mask_t channelMask,
-        size_t frameCount,
-        audio_output_flags_t flags,
-        android::AudioTrack::callback_t cbf,
-        void* user,
-        int32_t notificationFrames,
-        audio_session_t sessionId,
-        android::AudioTrack::transfer_type transferType,
-        const audio_offload_info_t *offloadInfo,
-        uid_t uid,
-        pid_t pid,
-        const audio_attributes_t* pAttributes,
-        bool doNotReconnect,
-        float maxRequiredSpeed,
-        audio_port_handle_t selectedDeviceId) {
-    AttributionSourceState attributionSource;
-    attributionSource.uid = uid;
-    attributionSource.pid = pid;
-    attributionSource.packageName = "com.mediatek.ims";
-    _ZN7android10AudioTrackC1E19audio_stream_type_tj14audio_format_t20audio_channel_mask_tj20audio_output_flags_tPFviPvS5_ES5_i15audio_session_tNS0_13transfer_typeEPK20audio_offload_info_tRKNS_7content22AttributionSourceStateEPK18audio_attributes_tbfi(
-                            thisptr, streamType, sampleRate, format, channelMask, frameCount, flags, cbf,
-                            user, notificationFrames, sessionId, transferType, offloadInfo,
-                            attributionSource, pAttributes, doNotReconnect, maxRequiredSpeed, selectedDeviceId);
-}
-
-void _ZN7android7SurfaceC1ERKNS_2spINS_22IGraphicBufferProducerEEEbRKNS1_INS_7IBinderEEE(
-    void* thisptr, const sp<IGraphicBufferProducer>& bufferProducer, bool controlledByApp, const sp<IBinder>& surfaceControlHandle);
-
-void _ZN7android7SurfaceC1ERKNS_2spINS_22IGraphicBufferProducerEEEb(
-    void* thisptr, const sp<IGraphicBufferProducer> &bufferProducer, bool controlledByApp) {
-        _ZN7android7SurfaceC1ERKNS_2spINS_22IGraphicBufferProducerEEEbRKNS1_INS_7IBinderEEE(thisptr, bufferProducer, controlledByApp, nullptr);
-}
-
-void _ZN7android10MediaMuxerC1EiNS_14MediaMuxerBase12OutputFormatE(void* thisptr, int fd, android::MediaMuxer::OutputFormat format);
-
-void _ZN7android10MediaMuxerC1EiNS0_12OutputFormatE(void* thisptr, int fd, android::MediaMuxer::OutputFormat format) {
-        _ZN7android10MediaMuxerC1EiNS_14MediaMuxerBase12OutputFormatE(thisptr, fd, format);
-}
-
-}
diff --git a/system.prop b/system.prop
index bf6f0c44d540a98fb3927a4222ee9cf74c58774a..e00cbdbe660b9d63adec4b3d317aead8ad139f25 100644
--- a/system.prop
+++ b/system.prop
@@ -1,6 +1,7 @@
 # Audio
 ro.camera.sound.forced=0
 ro.audio.silent=0
+ro.audio.usb.period_us=16000
 ro.config.vc_call_vol_steps=15
 
 # RIL
@@ -18,6 +19,15 @@ sys.ipo.disable=1
 # Kernel
 ro.kernel.zio=38,108,105,16
 
+# Memory
+ro.config.per_app_memcg=false
+
+# Misc
+ro.mediatek.version.branch=alps-mp-s0.mssi1
+persist.vendor.mdlog.flush_log_ratio=72340194296137244
+persist.vendor.pms_removable=1
+persist.vendor.vzw_device_type=0
+
 # WiFi
 wifi.direct.interface=p2p0
 wifi.interface=wlan0
@@ -25,6 +35,8 @@ ro.mediatek.wlan.wsc=1
 ro.mediatek.wlan.p2p=1
 mediatek.wlan.ctia=0
 wifi.tethering.interface=ap0
+persist.vendor.wfc.sys_wfc_support=1
 
 # Zygote
 ro.zygote.preload.enable=0
+zygote.critical_window.minute=10
diff --git a/vendor_props.mk b/vendor_props.mk
index 5070abc544053fb6c1878ba39554a340ba703897..92a63c06ebe87299a885c7945b216bb5e7ee45e3 100644
--- a/vendor_props.mk
+++ b/vendor_props.mk
@@ -4,6 +4,10 @@ else
 VENDOR_LOG_LEVEL=S
 endif
 
+# AEE
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.vendor.have_aee_feature=1
+
 # Audio
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.mtk_audio_alac_support=1 \
@@ -13,10 +17,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Bluetooth
 PRODUCT_PROPERTY_OVERRIDES += \
+    ro.vendor.bt.platform=connac1x \
+    ro.vendor.connsys.dedicated.log.port=bt,wifi,gps,mcu \
     ro.vendor.mtk.bt_sap_enable=true
 
 # Camera
 PRODUCT_PROPERTY_OVERRIDES += \
+    camera.disable_zsl_mode=1 \
     persist.vendor.camera3.pipeline.bufnum.base.imgo=4 \
     persist.vendor.camera3.pipeline.bufnum.base.lcso=4 \
     persist.vendor.camera3.pipeline.bufnum.base.rrzo=4 \
@@ -31,8 +38,12 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera3.pipeline.bufnum.min.low_ram.lcso=6 \
     persist.vendor.camera3.pipeline.bufnum.min.low_ram.rrzo=6 \
     persist.vendor.camera3.pipeline.bufnum.min.low_ram.rsso=6 \
+    ro.vendor.camera.isp.support.colorspace=0 \
     ro.vendor.camera3.zsl.default=130 \
+    ro.vendor.mtk_cam_security_support=1 \
     ro.vendor.mtk_camera_app_version=4 \
+    ro.vendor.mtk_external_sim_only_slots=0 \
+    ro.vendor.mtk_zsdhdr_support=1 \
     vendor.camera.aux.packagelist=org.codeaurora.snapcam,com.android.camera \
     vendor.camera.mdp.cz.enable=1 \
     vendor.camera.mdp.dre.enable=0
@@ -44,7 +55,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # DRM
 PRODUCT_PROPERTY_OVERRIDES += \
     drm.service.enabled=true \
-    ro.vendor.mtk_widevine_drm_l3_support=1
+    ro.vendor.mtk_widevine_drm_l3_support=1 \
+    ro.vendor.mtk_mvpu_security_support=0
 
 # Dex
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -73,9 +85,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
     renderthread.skia.reduceopstasksplitting \
     ro.hardware.egl=meow \
     ro.opengles.version=196610 \
-    ro.surface_flinger.force_hwc_copy_for_virtual_displays=true \
-    ro.surface_flinger.primary_display_orientation=ORIENTATION_0 \
-    ro.vendor.mtk_blulight_def_support=1
+    ro.vendor.pq.mtk_backlight_smooth_support=1 \
+    ro.vendor.pq.mtk_ultra_dimming_support=0 \
+    ro.vendor.pq.mtk_blulight_def_support=1
 
 # LMK
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -93,9 +105,34 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Media
 PRODUCT_PROPERTY_OVERRIDES += \
+    debug.stagefright.c2inputsurface=-1 \
+    media.c2.dmabuf.padding=3072 \
+    media.stagefright.thumbnail.prefer_hw_codecs=true \
     ro.vendor.mtk_pq_color_mode=1 \
     ro.vendor.mtk_pq_support=2 \
-    ro.vendor.mtk_aal_support=1 \
+    ro.vendor.pq.mtk_pq_video_whitelist_support=0 \
+    ro.vendor.pq.mtk_video_transition=0 \
+    ro.vendor.pq.mtk_scltm_support=0 \
+    ro.vendor.mml.mtk_mml_support=0 \
+    ro.vendor.pq.mtk_ai_scence_pq_support=0 \
+    ro.vendor.pq.mtk_hdr10_plus_recording_support=0 \
+    ro.vendor.pq.mtk_ai_sdr_to_hdr_support=0 \
+    ro.vendor.pq.mtk_ultra_resolution_support=0 \
+    ro.vendor.pq.mtk_dc_support=0 \
+    ro.vendor.pq.mtk_ds_support=0 \
+    ro.vendor.pq.mtk_hfg_support=0 \
+    ro.vendor.pq.mtk_caltm_support=1 \
+    ro.vendor.pq.mtk_clearzoom_support=0 \
+    ro.vendor.pq.mtk_mdp_ccorr_support=1 \
+    ro.vendor.pq.mtk_pq_interface_support=0 \
+    ro.vendor.pq.mtk_disp_c3d_support=0 \
+    ro.vendor.pq.mtk_disp_tdshp_support=0 \
+    ro.vendor.pq.mtk_disp_color_support=0 \
+    ro.vendor.pq.mtk_disp_ccorr_support=0 \
+    ro.vendor.pq.mtk_disp_gamma_support=0 \
+    ro.vendor.pq.mtk_aal_support=1 \
+    ro.vendor.pq.mtk_dre30_support=0 \
+    ro.vendor.pq.mtk_disp_game_pq_support=0 \
     ro.vendor.pref_scale_enable_cfg=1 \
     vendor.mtk.vdec.waitkeyframeforplay=9
 
@@ -109,39 +146,49 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.mtk_gps_support=1 \
     ro.vendor.mtk_log_hide_gps=1
 
-# GPS
+# Radio
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.radio.multisim.config=dsds \
-    persist.vendor.mims_support=2 \
-    persist.vendor.md_c2k_cap_dep_check=0 \
-    persist.vendor.mtk_sim_switch_policy=2 \
-    persist.vendor.radio.msimmode=dsds \
+    persist.vendor.pco5.radio.ctrl=0 \
     persist.vendor.radio.fd.counter=150 \
     persist.vendor.radio.fd.off.counter=50 \
     persist.vendor.radio.fd.off.r8.counter=50 \
     persist.vendor.radio.fd.r8.counter=150 \
+    persist.vendor.mims_support=2 \
+    persist.vendor.factory.GB2312=no \
+    persist.vendor.md_c2k_cap_dep_check=0 \
+    persist.vendor.mtk_sim_switch_policy=2 \
     persist.vendor.radio.mtk_dsbp_support=1 \
     persist.vendor.radio.mtk_ps2_rat=L/W/G \
     persist.vendor.radio.mtk_ps3_rat=G \
     persist.vendor.radio.smart.data.switch=1 \
     ro.telephony.default_network=9,9,9,9 \
-    ro.vendor.md_prop_ver=1 \
-    ro.vendor.mtk_external_sim_only_slots=0 \
-    ro.vendor.mtk_eccci_c2k=1 \
+    ro.telephony.iwlan_operation_mode=AP-assisted \
+    ro.telephony.sim.count=2 \
+    ro.vendor.mtk_fd_support=1 \
+    ro.vendor.mtk_single_bin_modem_support=1 \
+    ro.vendor.mtk_wapi_support=1 \
+    ro.vendor.mtk.bt_sap_enable=true \
     ro.vendor.mtk_embms_support=1 \
+    ro.vendor.mtk_sim_card_onoff=3 \
+    ro.vendor.num_md_protocol=2 \
+    ro.vendor.mtk_protocol1_rat_config=Lf/Lt/W/G \
+    ro.vendor.mtk_c2k_lte_mode=0 \
     ro.vendor.mtk_lte_support=1 \
+    ro.vendor.mtk_world_phone_policy=0 \
+    ro.vendor.sim_me_lock_mode=0 \
+    ro.vendor.mtk_external_sim_only_slots=0 \
     ro.vendor.mtk_md1_support=14 \
+    ro.vendor.mtk_eccci_c2k=1 \
+    ro.vendor.mtk_ril_mode=c6m_1rild \
     ro.vendor.mtk_md_world_mode_support=1 \
-    ro.vendor.mtk_protocol1_rat_config=Lf/W/G \
-    ro.vendor.mtk_ps1_rat=Lf/W/G \
+    ro.vendor.mtk_data_config=1 \
+    ro.vendor.md_prop_ver=1 \
     ro.vendor.mtk_ril_mode=c6m_1rild \
     ro.vendor.mtk_rild_read_imsi=1 \
-    ro.vendor.mtk_sim_wcard_onoff=3 \
-    ro.vendor.mtk_single_bin_modem_support=1 \
-    ro.vendor.mtk_uicc_clf=1 \
-    ro.vendor.mtk_world_phone_policy=0 \
+    ro.vendor.mtk_telephony_add_on_policy=0 \
     ro.vendor.radio.max.multisim=dsds \
-    ro.vendor.sim_refresh_reset_by_modem=1
+    telephony.active_modems.max_count=2
 
 # IMS
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -153,18 +200,20 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.vilte_support=1 \
     persist.vendor.viwifi_support=1 \
     ro.vendor.md_auto_setup_ims=1 \
-    persist.vendor.mtk_ct_volte_support=1 \
+    persist.vendor.mtk_ct_volte_support=3 \
     persist.dbg.volte_avail_ovr=1 \
     persist.dbg.vt_avail_ovr=1 \
     persist.dbg.wfc_avail_ovr=1
 
 # Storage
 PRODUCT_PROPERTY_OVERRIDES += \
+    persist.sys.fuse.passthrough.enable=true \
     ro.vendor.mtk_emmc_support=1 \
     ro.crypto.volume.filenames_mode=aes-256-cts
 
 # Sensors
 PRODUCT_PROPERTY_OVERRIDES += \
+    ro.jichuang_fpsensor=1 \
     ro.vendor.mtk.sensor.support=yes \
     ro.vendor.init.sensor.rc=init.sensor_1_0.rc
 
@@ -183,39 +232,28 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Mediatek
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.vendor.mediatek.platform=MT6765 \
-    ro.vendor.mediatek.version.branch=alps-mp-r0.mp1 \
-    ro.vendor.mediatek.version.release=alps-mp-r0.mp1-V8.46_lentek.r0mp1.k61v1.64.bsp_P16
+    ro.vendor.mtk_prefer_64bit_proc=0 \
+    ro.vendor.mediatek.version.branch=alps-mp-s0.mp1 \
+    ro.vendor.mediatek.version.release=alps-mp-s0.mp1.rc-V9.16.3_lentek.s0mp1rc.k61v1.64.bsp_P6
 
 # WiFi
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.connsys.chipid=-1 \
-    persist.vendor.connsys.dynamic.dump=0 \
     persist.vendor.connsys.patch.version=-1 \
+    persist.vendor.connsys.dynamic.dump=0 \
     ro.vendor.connsys.dedicated.log=1 \
     ro.vendor.wlan.gen=gen4m \
+    ro.vendor.wlan.chrdev=wmt_chrdev_wifi \
+    ro.vendor.wifi.sap.concurrent.iface=ap1 \
     ro.vendor.wifi.sap.interface=ap0 \
     ro.vendor.mtk_wappush_support=1 \
     ro.vendor.ap_info_monitor=0 \
+    ro.vendor.wlan.standalone.log=y \
     vendor.connsys.driver.ready=no \
     wifi.interface=wlan0
 
 # Logging
 PRODUCT_PROPERTY_OVERRIDES += \
-    persist.log.tag.RpAudioControl=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.WpfaFilterRuleReqHandler=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.NetAgentService=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.NetworkStats=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RfxSocketSM=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RmcRatSwHdlr=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RtcRatSwCtrl=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.ExternalSimMgr=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.ImsBaseCommands=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RmcCommSimOpReq=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RmcCommSimReq=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RmcCommSimUrc=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RmcDcCommon=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpModemMessage=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RtcCommSimCtrl=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.AT=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.AdnRecord=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.AdnRecordCache=$(VENDOR_LOG_LEVEL) \
@@ -300,18 +338,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.log.tag.PowerHalWifiMonitor=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.ProxyController=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RFX=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RP_DAC=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RP_DC=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RP_IMS=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RTC_DAC=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxAction=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxChannelMgr=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxCloneMgr=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxContFactory=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxController=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RfxDT=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxDebugInfo=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RfxDefDestUtils=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxDisThread=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxFragEnc=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxHandlerMgr=$(VENDOR_LOG_LEVEL) \
@@ -325,10 +358,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.log.tag.RfxObject=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxOpUtils=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxRoot=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RfxSM=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxStatusMgr=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxTimer=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RfxTransUtils=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RmcCapa=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RmcCdmaSimRequest=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RmcCdmaSimUrc=$(VENDOR_LOG_LEVEL) \
@@ -349,14 +380,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.log.tag.RmcPhbReq=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RmcPhbUrc=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RmcWp=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpCallControl=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpCdmaOemCtrl=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpFOUtils=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpMDCtrl=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpMalController=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpPhbController=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpPhoneNumberController=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpSimController=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RtcCapa=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RtcDC=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RtcEccNumberController=$(VENDOR_LOG_LEVEL) \
@@ -364,6 +387,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.log.tag.RtcEmbmsUtil=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RtcIms=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RtcImsConference=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.RtcImsConfigController=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RtcImsDialog=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RtcModeCont=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RtcNwCtrl=$(VENDOR_LOG_LEVEL) \
@@ -375,6 +399,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.log.tag.SimSwitchOP18=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.SlotQueueEntry=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.SpnOverride=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.Telecom=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.UiccCard=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.UiccController=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.UxUtility=$(VENDOR_LOG_LEVEL) \
@@ -408,41 +433,39 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.log.tag.mtkpower_client=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.wpfa_iptable_android=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.C2K_RIL-DATA=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.ExternalSimMgr=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.IMSRILRequest=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.IMS_RILA=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.ImsBaseCommands=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.RmcCommSimOpReq=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.RmcCommSimReq=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.RmcCommSimUrc=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.RmcDcCommon=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.RtcCommSimCtrl=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.MwiRIL=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RIL-CC=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RIL-DATA=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RIL-Fusion=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RIL-Netlink=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RIL-OEM=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RIL-PHB=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RIL-Parcel=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RIL-RP=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RIL-SIM=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RIL-SocListen=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RIL-Socket=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RIL=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RILC-MTK=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RILC-OP=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RILC-RP=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RILC=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RILD=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RILMD2-SS=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RILMUXD=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RIL_Mux=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RIL_UIM_SOCKET=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RadioManager=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxRilAdapter=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RfxRilUtils=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RilClient=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RilMalClient=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RilOemClient=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RilOpProxy=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RmcOpRadioReq=$(VENDOR_LOG_LEVEL) \
     persist.log.tag.RmcRadioReq=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpCdmaRadioCtrl=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpRadioCtrl=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpRadioMessage=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RpRilClientCtrl=$(VENDOR_LOG_LEVEL) \
-    persist.log.tag.RtcRadioCont=$(VENDOR_LOG_LEVEL)
+    persist.log.tag.RtcRadioCont=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.WpfaFilterRuleReqHandler=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.NetAgentService=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.NetworkStats=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.RmcRatSwHdlr=$(VENDOR_LOG_LEVEL) \
+    persist.log.tag.RtcRatSwCtrl=$(VENDOR_LOG_LEVEL)