sdm660-common: Update RIL blobs from S62Pro

Change-Id: I4528195d3102313262b988b557ca1bffda3034a3

Android.bp

@@ -102,20 +102,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "imssettings",
+	name: "embms",
 	owner: "xiaomi",
-	apk: "proprietary/system_ext/app/imssettings/imssettings.apk",
+	apk: "proprietary/system_ext/app/embms/embms.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "uceShimService",
-	owner: "xiaomi",
-	apk: "proprietary/system_ext/app/uceShimService/uceShimService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -159,13 +148,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "QtiTelephonyServicelibrary",
-	owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "com.qti.dpmframework",
 	owner: "xiaomi",
@@ -180,6 +162,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "embmslibrary",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/embmslibrary.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "qcrilhook",
 	owner: "xiaomi",

proprietary/etc/cne/Nexus/ATT/ATT_profiles.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2016-2017 Qualcomm Technologies, Inc.
-All Rights Reserved.
-Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<resources>
-<profiles>
-    <profile id="1">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-64,-70</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-67,-73</RSSIDropThreshold>
-    </profile>
-    <profile id="2">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-78,-78</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-85,-87</RSSIDropThreshold>
-    </profile>
-    <profile id="3">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-72,-72</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-79,-79</RSSIDropThreshold>
-    </profile>
-    <profile id="4">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-72,-75</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-75,-80</RSSIDropThreshold>
-    </profile>
-</profiles>
-</resources>

proprietary/etc/cne/Nexus/ROW/ROW_profiles.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2016-2017 Qualcomm Technologies, Inc.
-All Rights Reserved.
-Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<resources>
-<profiles>
-    <profile id="1">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-78,-78</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-85,-87</RSSIDropThreshold>
-    </profile>
-    <profile id="2">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-64,-70</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-67,-73</RSSIDropThreshold>
-    </profile>
-    <profile id="3">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-72,-75</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-75,-80</RSSIDropThreshold>
-    </profile>
-    <profile id="4">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-72,-72</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-79,-79</RSSIDropThreshold>
-    </profile>
-    <profile id="5">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-70,-75</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-73,-79</RSSIDropThreshold>
-    </profile>
-</profiles>
-</resources>

proprietary/etc/cne/Nexus/VZW/VZW_profiles.xml

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (c) 2016-2017 Qualcomm Technologies, Inc.
-All Rights Reserved.
-Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<resources>
-<profiles>
-    <profile id="1">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-64,-69</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-67,-72</RSSIDropThreshold>
-    </profile>
-    <profile id="2">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-78,-83</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-82,-87</RSSIDropThreshold>
-    </profile>
-    <profile id="3">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-67,-72</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-70,-75</RSSIDropThreshold>
-    </profile>
-    <profile id="4">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-82,-83</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-85,-87</RSSIDropThreshold>
-    </profile>
-    <profile id="5">
-        <!-- RSSI threshold from which all values greater than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-75,-75</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-79,-79</RSSIDropThreshold>
-    </profile>
-    <profile id="6">
-        <!-- RSSI threshold from which all values greather than it is
-        considered to be good for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIAddThreshold units="dbm">-75,-75</RSSIAddThreshold>
-        <!-- RSSI threshold from which all values lesser than it is
-        considered to be bad for wlan to be
-        a candidate for interface selection -->
-        <!-- NOTE: There needs to be two threshold values
-        first one for 2.4 GHz and the second for 5 GHz -->
-        <RSSIDropThreshold units="dbm">-79,-80</RSSIDropThreshold>
-    </profile>
-</profiles>
-</resources>

proprietary/system_ext/etc/dpm/dpm.conf

@@ -8,7 +8,7 @@ dpm_s0_fd_delay_time_timer_value:0
 dpm_s0_fd_screen_on_idle_timer_value:15
 #Idle timer value when SCREEN state is OFF
 #dpm_fd_screen_off_idle_timer_value = actual_screen_off_timer + delay_time
-dpm_s0_fd_screen_off_idle_timer_value:3
+dpm_s0_fd_screen_off_idle_timer_value:2
 #Idle timer value when TETHERING is ON
 #This takes precedence over SCREEN state
 #dpm_tethering_on_idle_timer_value = actual_tethering_on_timer + delay_time
@@ -25,7 +25,7 @@ dpm_s1_fd_delay_time_timer_value:0
 dpm_s1_fd_screen_on_idle_timer_value:15
 #Idle timer value when SCREEN state is OFF
 #dpm_fd_screen_off_idle_timer_value = actual_screen_off_timer + delay_time
-dpm_s1_fd_screen_off_idle_timer_value:3
+dpm_s1_fd_screen_off_idle_timer_value:2
 #Idle timer value when TETHERING is ON
 #This takes precedence over SCREEN state
 #dpm_tethering_on_idle_timer_value = actual_tethering_on_timer + delay_time

proprietary/system_ext/etc/init/dpmd.rc

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 - 2019 Qualcomm Technologies, Inc.
+# Copyright (c) 2018 - 2020 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 
@@ -15,3 +15,9 @@ service dpmd /system/system_ext/bin/dpmd
     socket tcm  stream 660 root inet
     socket dpmwrapper stream 660 root inet
     group system readproc inet radio wakelock oem_2901
+    disabled
+
+on property:persist.vendor.dpm.feature=*
+    start dpmd
+on property:persist.vendor.dpm.feature=0
+    stop dpmd

proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2015-2016 Qualcomm Technologies, Inc.
+<!--Copyright (c) 2015-2016, 2020 Qualcomm Technologies, Inc.
     All Rights Reserved.
     Confidential and Proprietary - Qualcomm Technologies, Inc.-->
 <permissions>
     <library name="com.qti.dpmframework"
         file="/system/system_ext/framework/com.qti.dpmframework.jar"/>
+    <library name="android.hidl.manager-V1.0-java"
+        file="/system/framework/android.hidl.manager-V1.0-java.jar"/>
     <permission name="com.qualcomm.permission.READPROC" >
     <group gid="readproc" />
     </permission>

proprietary/system_ext/etc/permissions/dpmapi.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2014, 2019 Qualcomm Technologies, Inc.  All Rights Reserved. Qualcomm Technologies Proprietary and Confidential.-->
+<!--Copyright (c) 2014, 2019-2020 Qualcomm Technologies, Inc.
+    All Rights Reserved.
+    Confidential and Proprietary - Qualcomm Technologies, Inc.-->
 <permissions>
     <library name="com.qti.dpmapi"
         file="/system/system_ext/framework/dpmapi.jar"/>

proprietary/system_ext/etc/permissions/embms.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+ <library name="com.qualcomm.embmslibrary"
+          file="/system_ext/framework/embmslibrary.jar"/>
+</permissions>

proprietary/system_ext/etc/permissions/qti_libpermissions.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!---
+    Copyright (c) 2017 Qualcomm Technologies, Inc.
+    All Rights Reserved.
+    Confidential and Proprietary - Qualcomm Technologies, Inc.
+ -->
+<permissions>
+    <library name="android.hidl.manager-V1.0-java"
+          file="/system/framework/android.hidl.manager-V1.0-java.jar"/>
+</permissions>

proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2020 Qualcomm Technologies, Inc.
+  ~ All Rights Reserved.
+  ~ Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<!--
+  ~ Copyright (c) 2017, The Linux Foundation. All rights reserved.
+
+  ~ Not a Contribution.
+-->
+
+<!--
+  ~ Copyright (C) 2016 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
+  -->
+
+<!--
+This XML file declares which signature|privileged permissions should be
+granted to privileged applications on QTI devices.
+It allows additional grants on top of privapp-permissions-platform.xml
+-->
+
+<permissions>
+
+    <privapp-permissions package="org.codeaurora.dialer">
+        <permission name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
+        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.STOP_APP_SWITCHES"/>
+        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
+        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
+        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="org.codeaurora.ims">
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS" />
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.mms">
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.qualcomm.qti.callenhancement">
+        <permission name="android.permission.RECORD_AUDIO" />
+        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
+        <permission name="android.permission.READ_EXTERNAL_STORAGE" />
+        <permission name="android.permission.WRITE_EXTERNAL_STORAGE" />
+        <permission name="android.permission.READ_BLOCKED_NUMBERS" />
+        <permission name="android.permission.VIBRATE" />
+    </privapp-permissions>
+
+    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="org.codeaurora.qti.nrNetworkSettingApp">
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+</permissions>

proprietary/vendor/etc/cne/mwqem.conf

@@ -0,0 +1,17 @@
+#configuration parameters for Multi-network Wireless Quality Estimation and Management.
+
+#Number of previous latency iterations to track to decide the better LQS interface
+latency_count:3
+#Threshold in ms to decide the better interface for LQS.
+latency_threshold:10
+#Number of tcp connections to be established in each latency session
+max_tcp_connects:3
+#Max waiting time for a dns query to be resolved
+dns_timeout:9
+#Minimum change in mwqem ratio to update the new LQA ratio
+lqa_update_threshold:0.25
+#Timer in msec to track the lqs updates. Only one update will be allowed
+#in this duration
+lqa_update_count_timer:10000
+#default URL for establishing a tcp sessions
+mwqem_http_url:www.qualcomm.com

proprietary/vendor/etc/cne/profileMwqem.xml

@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Copyright (c) 2020 Qualcomm Technologies, Inc.
+    All Rights Reserved.
+    Confidential and Proprietary - Qualcomm Technologies, Inc.-->
+<AndsfPolicy><Andsf>
+	    <Version>5.1</Version>
+		<Name>Test 1</Name>
+		<Ext>
+			<WQE>
+				<InterfaceManager>
+					<BQE_Disabled>true</BQE_Disabled>
+					<ICD_Disabled>true</ICD_Disabled>
+					<!-- Default bqe thresholds where no apIds are specified. -->
+					<BQE_Thresholds Id="128">
+						<RadioTechnology Type="CDMA2000">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="EVDO_0">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="EVDO_A">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="EVDO_B">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="EDGE">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="UMTS">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="HSPA">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="HSDPA">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="GPRS">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="LTE">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="EHRPD">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+						<RadioTechnology Type="HSPAP">
+							<Threshold units="bps">0</Threshold>
+						</RadioTechnology>
+					</BQE_Thresholds>
+					<Authentication>
+						<MaxAuthTime>60</MaxAuthTime>
+						<IcdBanRetest>3</IcdBanRetest>
+						<AuthApps>
+							<Appname>someauthapp1</Appname>
+							<Appname>someauthapp2</Appname>
+							<Appname>someauthapp3</Appname>
+						</AuthApps>
+					</Authentication>
+					<ICD config-type="disabled">
+					</ICD>
+                    <TQE>
+                        <!-- Default node for TQE_Thresholds element -->
+                        <TQE_Thresholds Id="128">
+                            <!-- Disabling Broken Backhaul Detector module -->
+                            <BBD_Disabled>true</BBD_Disabled>
+                            <!-- Disabling Degraded Backhaul Detector module -->
+                            <DBD_Disabled>true</DBD_Disabled>
+                            <!-- Threshold on downlink gap indicator metric -->
+                            <DGIMThresh units="msecs">400</DGIMThresh>
+                            <!-- DBD always returns pass when average device throughput is greater than min(DBDTputThresh,BQE_Threshold) -->
+                            <DBDTputThresh units="bps">1000000</DBDTputThresh>
+                            <!-- Time window for TQE history -->
+                            <TQETimeWindow units="secs">77</TQETimeWindow>
+                            <!-- Minimum fraction of sockets reporting BAD (among valid ones) to declare TQE FAIL -->
+                            <RatioThresh>0.2</RatioThresh>
+                        </TQE_Thresholds>
+                    </TQE>
+				</InterfaceManager>
+			</WQE>
+			<CQE prodId="Rome">
+				<!-- Default node for CQE_Thresholds element -->
+				<CQE_Thresholds Id="128">
+                    <!-- RSSI threshold from which all values greather than it is considered as good for wlan to be -->
+					<!-- a candidate for interface selection -->
+					<RSSIAddThreshold units="dbm">-79,-79</RSSIAddThreshold>
+					<!-- RSSI threshold from which all values lesser than it is considered as bad for wlan to be -->
+					<!-- a candidate for interface selection -->
+					<RSSIDropThreshold units="dbm">-79,-79</RSSIDropThreshold>
+					<!-- Interval over whcih RSSI values are averaged -->
+					<RSSIAveragingInterval units="secs">5</RSSIAveragingInterval>
+					<!-- RSSI threshold below which MAC hysteresis timer is not started -->
+					<RSSIMacTimerThreshold units="dbm">-85</RSSIMacTimerThreshold>
+					<!-- Periodic timer to evaluate CQE parameters including RSSI and MAC stats -->
+					<!-- Setting CQETimer to zero disables the CQE -->
+					<CQETimer units="secs">2</CQETimer>
+					<!-- Time for which CQE is not reevaluted after it was declared bad due to MAC stats -->
+					<MACHysteresisTimer units="secs">120</MACHysteresisTimer>
+					<!-- Alpha to compute RSSI averaging based on IIR filtering mechanism -->
+					<MACStatsAveragingAlpha>0.55</MACStatsAveragingAlpha>
+					<!-- Threshold for RX MPDU PER -->
+					<RMP_THR>1</RMP_THR>
+					<!-- Minimum MPDU count to activate RX MPDU PER -->
+					<RMP_CNT_THR>4</RMP_CNT_THR>
+					<!-- Cutoff RX MCS index -->
+					<RX_MCS_THR>9</RX_MCS_THR>
+					<!-- Cutoff RX BW index -->
+					<RX_BW_THR>3</RX_BW_THR>
+					<!-- Threshold for TX MSDU drop -->
+					<TMD_THR>1</TMD_THR>
+					<!-- Minimum MSDU count to activate TX MSDU drop -->
+					<TMD_CNT_THR>2</TMD_CNT_THR>
+					<!-- Threshold for MPDU retry rate -->
+					<TMR_THR>1</TMR_THR>
+					<!-- Minimum MPDU count to activate MPDU retry rate -->
+					<TMR_CNT_THR>50</TMR_CNT_THR>
+					<!-- Cutoff TX MCS index -->
+					<TX_MCS_THR>8</TX_MCS_THR>
+					<!-- Cutoff TX BW index -->
+					<TX_BW_THR>2</TX_BW_THR>
+					<!-- Maximum MPDU count to activate RX MPDU PER -->
+					<RMP_UBCNT_THR>100</RMP_UBCNT_THR>
+					<!-- Maximum MPDU count to activate MPDU retry rate -->
+					<TMR_UBCNT_THR>300</TMR_UBCNT_THR>
+					<!-- Threshold for PERAM -->
+					<PERAM_THR>1</PERAM_THR>
+					<!-- Minimum MPDU count to activate PERAM -->
+					<PERAM_CNT_THR>4</PERAM_CNT_THR>
+					<!-- Maximum MPDU count to activate PERAM -->
+					<PERAM_UBCNT_THR>80</PERAM_UBCNT_THR>
+					<!-- CQE throughput Threshold-->
+					<CQE_TPUT_THR>1000000</CQE_TPUT_THR>
+				</CQE_Thresholds>
+			</CQE>
+		    <CQE prodId="Helium">
+				<!-- Default node for CQE_Thresholds element -->
+				<CQE_Thresholds Id="128">
+                    <!-- RSSI threshold from which all values greather than it is considered as good for wlan to be -->
+					<!-- a candidate for interface selection -->
+					<RSSIAddThreshold units="dbm">-79,-79</RSSIAddThreshold>
+					<!-- RSSI threshold from which all values lesser than it is considered as bad for wlan to be -->
+					<!-- a candidate for interface selection -->
+					<RSSIDropThreshold units="dbm">-79,-79</RSSIDropThreshold>
+					<!-- Interval over whcih RSSI values are averaged -->
+					<RSSIAveragingInterval units="secs">5</RSSIAveragingInterval>
+					<!-- RSSI threshold below which MAC hysteresis timer is not started -->
+					<RSSIMacTimerThreshold units="dbm">-85</RSSIMacTimerThreshold>
+					<!-- Periodic timer to evaluate CQE parameters including RSSI and MAC stats -->
+					<!-- Setting CQETimer to zero disables the CQE -->
+					<CQETimer units="secs">2</CQETimer>
+					<!-- Time for which CQE is not reevaluted after it was declared bad due to MAC stats -->
+					<MACHysteresisTimer units="secs">120</MACHysteresisTimer>
+					<!-- Alpha to compute RSSI averaging based on IIR filtering mechanism -->
+					<MACStatsAveragingAlpha>0.7</MACStatsAveragingAlpha>
+					<!-- Threshold for RX MPDU PER -->
+					<RMP_THR>1</RMP_THR>
+					<!-- Minimum MPDU count to activate RX MPDU PER -->
+					<RMP_CNT_THR>10</RMP_CNT_THR>
+					<!-- Cutoff RX MCS index -->
+					<RX_MCS_THR>9</RX_MCS_THR>
+					<!-- Cutoff RX BW index -->
+					<RX_BW_THR>3</RX_BW_THR>
+					<!-- Threshold for TX MSDU drop -->
+					<TMD_THR>1</TMD_THR>
+					<!-- Minimum MSDU count to activate TX MSDU drop -->
+					<TMD_CNT_THR>2</TMD_CNT_THR>
+					<!-- Threshold for MPDU retry rate -->
+					<TMR_THR>1</TMR_THR>
+					<!-- Minimum MPDU count to activate MPDU retry rate -->
+					<TMR_CNT_THR>100</TMR_CNT_THR>
+					<!-- Cutoff TX MCS index -->
+					<TX_MCS_THR>4</TX_MCS_THR>
+					<!-- Cutoff TX BW index -->
+					<TX_BW_THR>2</TX_BW_THR>
+					<!-- Maximum MPDU count to activate RX MPDU PER -->
+					<RMP_UBCNT_THR>1000</RMP_UBCNT_THR>
+					<!-- Maximum MPDU count to activate MPDU retry rate -->
+					<TMR_UBCNT_THR>1000</TMR_UBCNT_THR>
+					<!-- Threshold for PERAM -->
+					<PERAM_THR>1</PERAM_THR>
+					<!-- Minimum MPDU count to activate PERAM -->
+					<PERAM_CNT_THR>20</PERAM_CNT_THR>
+					<!-- Maximum MPDU count to activate PERAM -->
+					<PERAM_UBCNT_THR>1000</PERAM_UBCNT_THR>
+					<!-- CQE throughput Threshold-->
+					<CQE_TPUT_THR>1000000</CQE_TPUT_THR>
+				</CQE_Thresholds>
+			</CQE>
+			<CQE prodId="Pronto">
+				<!-- Default node for CQE_Thresholds element -->
+				<CQE_Thresholds Id="128">
+					<!-- RSSI threshold from which all values greather than it is considered as good for wlan to be -->
+					<!-- a candidate for interface selection -->
+					<RSSIAddThreshold units="dbm">-79,-79</RSSIAddThreshold>
+					<!-- RSSI threshold from which all values lesser than it is considered as bad for wlan to be -->
+					<!-- a candidate for interface selection -->
+					<RSSIDropThreshold units="dbm">-79,-79</RSSIDropThreshold>
+					<!-- RSSI threshold from which to select linear model to compute CQE metric -->
+					<RSSIModelThreshold units="dbm">-74</RSSIModelThreshold>
+					<!-- Interval over whcih RSSI values are averaged -->
+					<RSSIAveragingInterval units="secs">5</RSSIAveragingInterval>
+					<!-- RSSI threshold below which MAC hysteresis timer is not started -->
+					<RSSIMacTimerThreshold units="dbm">-91</RSSIMacTimerThreshold>
+					<!-- Periodic timer to evaluate CQE parameters including RSSI and MAC stats -->
+					<!-- Setting CQETimer to zero disables the CQE -->
+					<CQETimer units="secs">2</CQETimer>
+					<!-- Time for which CQE is not reevaluted after it was declared bad due to MAC stats -->
+					<MACHysteresisTimer units="secs">120</MACHysteresisTimer>
+					<!-- Alpha to compute RSSI averaging based on IIR filtering mechanism -->
+					<MACStatsAveragingAlpha>0.47</MACStatsAveragingAlpha>
+					<!-- The threshold indicating the number of frames below which no valid CQE estimation can't be done -->
+					<FrameCntThreshold units="frames">8</FrameCntThreshold>
+					<!-- The threshold indicating the number of last samples below which valid CQE estimation can't be done -->
+					<ColdStartThreshold units="frames">2</ColdStartThreshold>
+					<!-- The threshold that ultimately decides the wlan is good or bad based on the combined MAC parameters -->
+					<!-- such as retry, multi-retry, fail and  ack fail metric -->
+					<!-- when average RSSI is greater than RSSIModelThreshold -->
+                    <MACMibThreshold2a>1</MACMibThreshold2a>
+					<!-- The weightage that given to retry metric in computation of CQE -->
+					<!-- when average RSSI is greater than RSSIModelThreshold -->
+					<RetryMetricWeight2a>0.0597</RetryMetricWeight2a>
+					<!-- The weightage that given to multi-retry metric in computation of CQE -->
+					<!-- when average RSSI is greater than RSSIModelThreshold -->
+					<MultiRetryMetricWeight2a>0.8895</MultiRetryMetricWeight2a>
+					<!-- The threshold that ultimately decides the wlan is good or bad based on the combined MAC parameters -->
+					<!-- such as retry, multi-retry, fail and  ack fail metric -->
+					<!-- when average RSSI is less than or equal to RSSIModelThreshold -->
+					<MACMibThreshold2b>1</MACMibThreshold2b>
+					<!-- The weightage that given to retry metric in computation of CQE -->
+					<!-- when average RSSI is less than or equal to RSSIModelThreshold -->
+					<RetryMetricWeight2b>0.1366</RetryMetricWeight2b>
+					<!-- The weightage that given to multi-retry metric in computation of CQE -->
+					<!-- when average RSSI is less than or equal to RSSIModelThreshold -->
+					<MultiRetryMetricWeight2b>0.5795</MultiRetryMetricWeight2b>
+				</CQE_Thresholds>
+			</CQE>
+		</Ext>
+	</Andsf></AndsfPolicy>

proprietary/vendor/etc/data/dsi_config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      DSI Module configuration XML file
-     Copyright (c) 2013, 2015, 2017-2019 Qualcomm Technologies, Inc.
+     Copyright (c) 2013, 2015, 2017-2021 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -119,6 +119,7 @@
 
      <data name="single_qmux_channel_enabled" type="int"> 1 </data>
      <data name="single_qmux_channel_name" type="string"> rmnet_mhi0 </data>
+     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
 
      <data name="num_dsi_handles" type="int"> 8 </data>
      <list name="device_names">
@@ -1163,7 +1164,7 @@
      <data name="single_qmux_channel_enabled" type="int"> 1 </data>
      <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
 
-     <data name="num_dsi_handles" type="int"> 11 </data>
+     <data name="num_dsi_handles" type="int"> 17 </data>
      <list name="device_names">
        <data type="string"> rmnet_data0 </data>
        <data type="string"> rmnet_data1 </data>
@@ -1176,6 +1177,12 @@
        <data type="string"> rmnet_data8 </data>
        <data type="string"> rmnet_data9 </data>
        <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
      </list>
 
      <list name="control_port_names">
@@ -1190,6 +1197,118 @@
        <data type="string"> rmnet_data8 </data>
        <data type="string"> rmnet_data9 </data>
        <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
+     </list>
+   </listitem>
+
+   <!-- Configuration for lahaina -->
+   <listitem name="lahaina">
+
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 17 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
+     </list>
+   </listitem>
+
+   <!-- Configuration for monaco-->
+   <listitem name="monaco">
+
+     <data name="qos_enabled" type="int"> 1 </data>
+     <data name="rmnet_data_enabled" type="int"> 1 </data>
+     <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+     <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+     <data name="single_qmux_channel_enabled" type="int"> 1 </data>
+     <data name="single_qmux_channel_name" type="string"> rmnet0 </data>
+
+     <data name="num_dsi_handles" type="int"> 17 </data>
+     <list name="device_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
+     </list>
+
+     <list name="control_port_names">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
      </list>
    </listitem>
 </list>

proprietary/vendor/etc/data/netmgr_config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Netmgr Module configuration XML file
-     Copyright (c) 2013, 2016-2019 Qualcomm Technologies, Inc.
+     Copyright (c) 2013, 2016-2021 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -39,8 +39,6 @@
       <data name="pnd_rps_mask" type="int"> 0 </data>
       <data name="netdev_budget" type="int"> 0 </data>
 
-      <data name="low_latency_filters" type="int"> 0 </data>
-
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
          <data type="int"> 1 </data> <!-- MODEM_MSM -->
@@ -295,6 +293,7 @@
       <data name="netdev_budget" type="int"> 9 </data>
       <data name="tc_ul_baserate" type="int"> 0 </data>
       <data name="low_latency_filters" type="int"> 1 </data>
+      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
 
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -378,7 +377,6 @@
       <data name="pnd_rps_mask" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 0 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="netdev_max_backlog" type="int"> 10000 </data>
       <data name="tc_ul_baserate" type="int"> 55000000 </data>
       <data name="num_modems" type="int"> 2 </data>
@@ -463,7 +461,6 @@
       <data name="pnd_rps_mask" type="int"> 16 </data>
       <data name="qos_via_idl" type="int"> 0 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
          <data type="int"> 1 </data> <!-- MODEM_MSM -->
@@ -546,7 +543,6 @@
       <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="netdev_budget" type="int"> 9 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 0 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
@@ -634,7 +630,6 @@
       <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
       <data name="pnd_rps_mask" type="int"> 0 </data>
       <data name="netdev_budget" type="int"> 9 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -693,7 +688,6 @@
       <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
       <data name="pnd_rps_mask" type="int"> 16 </data>
       <data name="netdev_budget" type="int"> 9 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -778,7 +772,6 @@
       <data name="pnd_rps_mask" type="int"> 16 </data>
       <data name="vnd_rps_mask" type="int"> 32 </data>
       <data name="netdev_budget" type="int"> 9 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -863,7 +856,6 @@
       <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="netdev_budget" type="int"> 9 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -948,7 +940,6 @@
       <data name="pnd_rps_mask" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 0 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="tc_ul_baserate" type="int"> 55000000 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -1029,8 +1020,6 @@
      <data name="dataformat_ul_gso_enabled" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 0n </data>
 
-     <data name="low_latency_filters" type="int"> 0 </data>
-
      <data name="frag_low_mem" type="int"> 300000 </data>
      <data name="frag_high_mem" type="int"> 400000 </data>
 
@@ -1089,7 +1078,6 @@
 
       <data name="pnd_rps_mask" type="int"> 16 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
@@ -1171,7 +1159,6 @@
 
       <data name="pnd_rps_mask" type="int"> 01 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
       <data name="num_modems" type="int"> 2 </data>
@@ -1260,7 +1247,6 @@
       <data name="vnd_rps_mask" type="int"> 0 </data>
       <data name="clat_rps_mask" type="int"> 32 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
@@ -1359,7 +1345,6 @@
       <data name="vnd_rps_mask" type="int"> 4 </data>
       <data name="clat_rps_mask" type="int"> 8 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
@@ -1458,7 +1443,6 @@
       <data name="vnd_rps_mask" type="int"> 4 </data>
       <data name="clat_rps_mask" type="int"> 8 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
@@ -1556,7 +1540,6 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 13 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
@@ -1654,7 +1637,6 @@
       <data name="vnd_rps_mask" type="int"> 15 </data>
       <data name="netdev_budget" type="int"> 0 </data>
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
@@ -1744,7 +1726,6 @@
     <data name="pnd_rps_mask" type="int"> 1 </data>
     <data name="vnd_rps_mask" type="int"> 0 </data>
     <data name="netdev_budget" type="int"> 9 </data>
-    <data name="low_latency_filters" type="int"> 0 </data>
 
     <data name="num_modems" type="int"> 2 </data>
     <list name="modems_enabled">
@@ -1828,8 +1809,6 @@
      <data name="qos_via_idl" type="int"> 0 </data>
      <data name="tc_ul_baserate" type="int"> 0 </data>
 
-     <data name="low_latency_filters" type="int"> 0 </data>
-
      <data name="frag_low_mem" type="int"> 300000 </data>
      <data name="frag_high_mem" type="int"> 400000 </data>
 
@@ -1986,7 +1965,6 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 13 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
 
       <data name="num_modems" type="int"> 2 </data>
@@ -2185,7 +2163,6 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 12 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
@@ -2297,7 +2274,6 @@
       <data name="vnd_rps_mask" type="int"> 12 </data>
       <data name="netdev_budget" type="int"> 0 </data>
       <data name="tcp_mtu_probing" type="int"> 2 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="skip_buffered_qos_modify" type="int"> 1 </data>
 
@@ -2373,7 +2349,7 @@
       <data name="use_qmuxd" type="int"> 0 </data>
       <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 3 </data>
+      <data name="kfc_mode" type="int"> 4 </data>
       <data name="qmi_pc" type="int"> 1 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
 
@@ -2406,9 +2382,9 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 13 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="max_mtu" type="int"> 0 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
          <data type="int"> 1 </data> <!-- MODEM_MSM -->
@@ -2571,7 +2547,7 @@
       <data name="use_qmuxd" type="int"> 0 </data>
       <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 3 </data>
+      <data name="kfc_mode" type="int"> 4 </data>
       <data name="qmi_pc" type="int"> 1 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
 
@@ -2594,7 +2570,7 @@
       <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
       <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
       <data name="rmnet_perf" type="int"> 1 </data>
-      <data name="rmnet_shs" type="int"> 1 </data>
+      <data name="rmnet_shs" type="int"> 2 </data>
       <data name="netdev_max_backlog" type="int"> 100000 </data>
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
       <data name="disable_hystart" type="int"> 1 </data>
@@ -2604,9 +2580,9 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 125 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="max_mtu" type="int"> 9216 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
          <data type="int"> 1 </data> <!-- MODEM_MSM -->
@@ -2679,7 +2655,8 @@
       <data name="use_qmuxd" type="int"> 0 </data>
       <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 3 </data>
+      <data name="kfc_mode" type="int"> 4 </data>
+      <data name="kfc_qmap" type="int"> 1 </data>
       <data name="qmi_pc" type="int"> 1 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
 
@@ -2709,6 +2686,7 @@
       <data name="rmnet_perf" type="int"> 3 </data>
       <data name="rmnet_shs" type="int"> 1 </data>
       <data name="netdev_max_backlog" type="int"> 100000 </data>
+
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
       <data name="disable_hystart" type="int"> 1 </data>
       <data name="initial_ssthresh" type="int"> 1400 </data>
@@ -2719,6 +2697,7 @@
       <data name="low_latency_filters" type="int"> 1 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="max_mtu" type="int"> 9216 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
       <data type="int"> 1 </data> <!-- MODEM_MSM -->
@@ -2821,7 +2800,8 @@
       <data name="use_qmuxd" type="int"> 0 </data>
       <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 3 </data>
+      <data name="kfc_mode" type="int"> 4 </data>
+      <data name="kfc_qmap" type="int"> 1 </data>
       <data name="qmi_pc" type="int"> 1 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
 
@@ -2836,7 +2816,7 @@
       <data name="dataformat_agg_dl_size" type="int"> 31668 </data>
       <data name="dataformat_agg_ul_pkt" type="int"> 32 </data>
       <data name="dataformat_agg_ul_size" type="int"> 16384 </data>
-      <data name="dataformat_agg_ul_time" type="int"> 3000000 </data>
+      <data name="dataformat_agg_ul_time" type="int"> 1000000 </data>
       <data name="dataformat_agg_ul_features" type="int"> 1 </data>
       <data name="dataformat_dl_data_aggregation_protocol" type="int"> 9 </data>
       <data name="dataformat_ul_data_aggregation_protocol" type="int"> 9 </data>
@@ -2850,6 +2830,7 @@
       <data name="rtnetlink_tc_enabled" type="int"> 1 </data>
       <data name="rmnet_perf" type="int"> 3 </data>
       <data name="rmnet_shs" type="int"> 1 </data>
+      <data name="uplink_priority" type="int"> 1 </data>
       <data name="netdev_max_backlog" type="int"> 100000 </data>
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
       <data name="disable_hystart" type="int"> 1 </data>
@@ -2858,9 +2839,12 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 125 </data>
       <data name="netdev_budget" type="int"> 0 </data>
+      <data name="debug_netdev_max_backlog" type="int"> 1500 </data>
+
       <data name="low_latency_filters" type="int"> 1 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="max_mtu" type="int"> 9216 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
       <data type="int"> 1 </data> <!-- MODEM_MSM -->
@@ -2963,7 +2947,7 @@
       <data name="use_qmuxd" type="int"> 0 </data>
       <data name="dpm_retry_timeout" type="int"> 10000 </data>
       <data name="wda_data_format_enabled" type="int"> 1 </data>
-      <data name="kfc_mode" type="int"> 3 </data>
+      <data name="kfc_mode" type="int"> 4 </data>
       <data name="qmi_pc" type="int"> 1 </data>
       <data name="tcp_ack_prio" type="int"> 1 </data>
 
@@ -2989,6 +2973,7 @@
       <data name="rsb" type="int"> 1 </data>
       <data name="rmnet_shs" type="int"> 1 </data>
       <data name="rmnet_perf" type="int"> 3 </data>
+      <data name="uplink_priority" type="int"> 1 </data>
       <data name="netdev_max_backlog" type="int"> 100000 </data>
       <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
       <data name="disable_hystart" type="int"> 1 </data>
@@ -2998,61 +2983,225 @@
       <data name="pnd_rps_mask" type="int"> 2 </data>
       <data name="vnd_rps_mask" type="int"> 204 </data>
       <data name="netdev_budget" type="int"> 0 </data>
-      <data name="low_latency_filters" type="int"> 0 </data>
       <data name="qos_via_idl" type="int"> 1 </data>
       <data name="max_mtu" type="int"> 8192 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
       <data name="num_modems" type="int"> 2 </data>
       <list name="modems_enabled">
          <data type="int"> 1 </data> <!-- MODEM_MSM -->
          <data type="int"> 0 </data> <!-- MODEM_MDM -->
       </list>
 
-      <data name="control_ports_len" type="int"> 11 </data>
+     <data name="control_ports_len" type="int"> 17 </data>
-      <list name="control_ports">
+     <list name="control_ports">
-         <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data0 </data>
-         <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data1 </data>
-         <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data2 </data>
-         <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data3 </data>
-         <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data4 </data>
-         <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data5 </data>
-         <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data6 </data>
-         <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data7 </data>
-         <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data8 </data>
-         <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data9 </data>
-         <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
+     </list>
+
+     <data name="data_ports_len" type="int"> 17 </data>
+     <list name="data_ports">
+       <data type="string"> rmnet_data0 </data>
+       <data type="string"> rmnet_data1 </data>
+       <data type="string"> rmnet_data2 </data>
+       <data type="string"> rmnet_data3 </data>
+       <data type="string"> rmnet_data4 </data>
+       <data type="string"> rmnet_data5 </data>
+       <data type="string"> rmnet_data6 </data>
+       <data type="string"> rmnet_data7 </data>
+       <data type="string"> rmnet_data8 </data>
+       <data type="string"> rmnet_data9 </data>
+       <data type="string"> rmnet_data10 </data>
+       <data type="string"> rmnet_data11 </data>
+       <data type="string"> rmnet_data12 </data>
+       <data type="string"> rmnet_data13 </data>
+       <data type="string"> rmnet_data14 </data>
+       <data type="string"> rmnet_data15 </data>
+       <data type="string"> rmnet_data16 </data>
+     </list>
+     <!-- Number of above data ports inited on bootup -->
+     <data name="static_fwd_links" type="int"> 6 </data>
+
+     <!-- iWLAN ports -->
+     <data name="iwlan_enable" type="int"> 1 </data>
+     <data name="rev_control_ports_len" type="int"> 16 </data>
+     <list name="rev_control_ports">
+       <data type="string"> r_rmnet_data0 </data>
+       <data type="string"> r_rmnet_data1 </data>
+       <data type="string"> r_rmnet_data2 </data>
+       <data type="string"> r_rmnet_data3 </data>
+       <data type="string"> r_rmnet_data4 </data>
+       <data type="string"> r_rmnet_data5 </data>
+       <data type="string"> r_rmnet_data6 </data>
+       <data type="string"> r_rmnet_data7 </data>
+       <data type="string"> r_rmnet_data8 </data>
+       <data type="string"> r_rmnet_data9 </data>
+       <data type="string"> r_rmnet_data10 </data>
+       <data type="string"> r_rmnet_data11 </data>
+       <data type="string"> r_rmnet_data12 </data>
+       <data type="string"> r_rmnet_data13 </data>
+       <data type="string"> r_rmnet_data14 </data>
+       <data type="string"> r_rmnet_data15 </data>
+     </list>
+
+     <data name="rev_data_ports_len" type="int"> 16 </data>
+     <list name="rev_data_ports">
+       <data type="string"> r_rmnet_data0 </data>
+       <data type="string"> r_rmnet_data1 </data>
+       <data type="string"> r_rmnet_data2 </data>
+       <data type="string"> r_rmnet_data3 </data>
+       <data type="string"> r_rmnet_data4 </data>
+       <data type="string"> r_rmnet_data5 </data>
+       <data type="string"> r_rmnet_data6 </data>
+       <data type="string"> r_rmnet_data7 </data>
+       <data type="string"> r_rmnet_data8 </data>
+       <data type="string"> r_rmnet_data9 </data>
+       <data type="string"> r_rmnet_data10 </data>
+       <data type="string"> r_rmnet_data11 </data>
+       <data type="string"> r_rmnet_data12 </data>
+       <data type="string"> r_rmnet_data13 </data>
+       <data type="string"> r_rmnet_data14 </data>
+       <data type="string"> r_rmnet_data15 </data>
+     </list>
+     <!-- Number of above reverse data ports inited on bootup -->
+     <data name="static_rev_links" type="int"> 4 </data>
+   </listitem>
+
+   <!-- lahaina parameters -->
+   <listitem name = "lahaina">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 0 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+      <data name="kfc_mode" type="int"> 4 </data>
+      <data name="kfc_qmap" type="int"> 1 </data>
+      <data name="qmi_pc" type="int"> 1 </data>
+      <data name="tcp_ack_prio" type="int"> 1 </data>
+      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 63 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 64844 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 32 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 16384 </data>
+      <data name="dataformat_agg_ul_time" type="int"> 1000000 </data>
+      <data name="dataformat_agg_ul_features" type="int"> 1 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 9 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 9 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
+      <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
+      <data name="rsc" type="int"> 2 </data>
+      <data name="rsb" type="int"> 2 </data>
+      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+      <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
+      <data name="rmnet_offload" type="int"> 1 </data>
+      <data name="rmnet_shs" type="int"> 1 </data>
+      <data name="uplink_priority" type="int"> 1 </data>
+      <data name="iwlan_concurrency" type="int"> 1 </data>
+      <data name="nl_xfrm" type="int"> 1 </data>
+      <data name="netdev_max_backlog" type="int"> 100000 </data>
+      <data name="debug_netdev_max_backlog" type="int"> 1500 </data>
+
+      <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
+      <data name="disable_hystart" type="int"> 1 </data>
+      <data name="initial_ssthresh" type="int"> 1400 </data>
+      <data name="dl_marker_enabled" type="int"> 2 </data>
+      <data name="pnd_rps_mask" type="int"> 2 </data>
+      <data name="vnd_rps_mask" type="int"> 125 </data>
+      <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="max_mtu" type="int"> 9216 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+      <data type="int"> 1 </data> <!-- MODEM_MSM -->
+      <data type="int"> 0 </data> <!-- MODEM_MDM -->
       </list>
 
-      <data name="data_ports_len" type="int"> 11 </data>
+      <data name="control_ports_len" type="int"> 17 </data>
-      <list name="data_ports">
+      <list name="control_ports">
-         <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data0 </data>
-         <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data1 </data>
-         <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data2 </data>
-         <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data3 </data>
-         <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data4 </data>
-         <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data5 </data>
-         <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data6 </data>
-         <data type="string"> rmnet_data7 </data>
+        <data type="string"> rmnet_data7 </data>
-         <data type="string"> rmnet_data8 </data>
+        <data type="string"> rmnet_data8 </data>
-         <data type="string"> rmnet_data9 </data>
+        <data type="string"> rmnet_data9 </data>
-         <data type="string"> rmnet_data10 </data>
+        <data type="string"> rmnet_data10 </data>
+        <data type="string"> rmnet_data11 </data>
+        <data type="string"> rmnet_data12 </data>
+        <data type="string"> rmnet_data13 </data>
+        <data type="string"> rmnet_data14 </data>
+        <data type="string"> rmnet_data15 </data>
+        <data type="string"> rmnet_data16 </data>
       </list>
 
+      <data name="data_ports_len" type="int"> 17 </data>
+      <list name="data_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+        <data type="string"> rmnet_data8 </data>
+        <data type="string"> rmnet_data9 </data>
+        <data type="string"> rmnet_data10 </data>
+        <data type="string"> rmnet_data11 </data>
+        <data type="string"> rmnet_data12 </data>
+        <data type="string"> rmnet_data13 </data>
+        <data type="string"> rmnet_data14 </data>
+        <data type="string"> rmnet_data15 </data>
+        <data type="string"> rmnet_data16 </data>
+      </list>
+      <!-- Number of above data ports inited on bootup -->
+      <data name="static_fwd_links" type="int"> 6 </data>
+
       <!-- iWLAN ports -->
       <data name="iwlan_enable" type="int"> 1 </data>
-      <data name="rev_control_ports_len" type="int"> 9 </data>
+      <data name="rev_control_ports_len" type="int"> 16 </data>
       <list name="rev_control_ports">
-         <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data0 </data>
-         <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data1 </data>
-         <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data2 </data>
-         <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data3 </data>
-         <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data4 </data>
-         <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data5 </data>
-         <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data6 </data>
-         <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data7 </data>
-         <data type="string"> r_rmnet_data8 </data>
+        <data type="string"> r_rmnet_data8 </data>
+        <data type="string"> r_rmnet_data9 </data>
+        <data type="string"> r_rmnet_data10 </data>
+        <data type="string"> r_rmnet_data11 </data>
+        <data type="string"> r_rmnet_data12 </data>
+        <data type="string"> r_rmnet_data13 </data>
+        <data type="string"> r_rmnet_data14 </data>
+        <data type="string"> r_rmnet_data15 </data>
       </list>
 
-      <data name="rev_data_ports_len" type="int"> 9 </data>
+      <data name="rev_data_ports_len" type="int"> 16 </data>
       <list name="rev_data_ports">
         <data type="string"> r_rmnet_data0 </data>
         <data type="string"> r_rmnet_data1 </data>
@@ -3063,7 +3212,158 @@
         <data type="string"> r_rmnet_data6 </data>
         <data type="string"> r_rmnet_data7 </data>
         <data type="string"> r_rmnet_data8 </data>
+        <data type="string"> r_rmnet_data9 </data>
+        <data type="string"> r_rmnet_data10 </data>
+        <data type="string"> r_rmnet_data11 </data>
+        <data type="string"> r_rmnet_data12 </data>
+        <data type="string"> r_rmnet_data13 </data>
+        <data type="string"> r_rmnet_data14 </data>
+        <data type="string"> r_rmnet_data15 </data>
       </list>
+      <!-- Number of above reverse data ports inited on bootup -->
+      <data name="static_rev_links" type="int"> 4 </data>
    </listitem>
 
+   <!-- monaco parameters -->
+   <listitem name = "monaco">
+
+      <data name="qmi_dpm_enabled" type="int"> 1 </data>
+      <data name="use_qmuxd" type="int"> 0 </data>
+      <data name="dpm_retry_timeout" type="int"> 10000 </data>
+      <data name="wda_data_format_enabled" type="int"> 1 </data>
+      <data name="kfc_mode" type="int"> 0 </data>
+      <data name="kfc_qmap" type="int"> 0 </data>
+      <data name="qmi_pc" type="int"> 0 </data>
+      <data name="tcp_ack_prio" type="int"> 1 </data>
+      <data name="netmgr_listen_ev_proto" type="int"> 1 </data>
+
+      <data name="single_qmux_ch_enabled" type="int"> 1 </data>
+      <data name="single_qmux_ch_conn_id_str" type="string"> rmnet0 </data>
+      <data name="single_qmux_ch_name" type="string"> DATA5_CNTL </data>
+      <data name="rmnet_data_enabled" type="int"> 1 </data>
+      <data name="dataformat_agg_dl_pkt" type="int"> 63 </data>
+      <data name="dataformat_agg_dl_size" type="int"> 64844 </data>
+      <data name="dataformat_agg_ul_pkt" type="int"> 32 </data>
+      <data name="dataformat_agg_ul_size" type="int"> 16384 </data>
+      <data name="dataformat_agg_ul_time" type="int"> 1000000 </data>
+      <data name="dataformat_agg_ul_features" type="int"> 1 </data>
+      <data name="dataformat_dl_data_aggregation_protocol" type="int"> 9 </data>
+      <data name="dataformat_ul_data_aggregation_protocol" type="int"> 9 </data>
+      <data name="dataformat_dl_gro_enabled" type="int"> 1 </data>
+      <data name="dataformat_ul_gso_enabled" type="int"> 1 </data>
+      <data name="rsc" type="int"> 0 </data>
+      <data name="rsb" type="int"> 0 </data>
+      <data name="phys_net_dev" type="string"> rmnet_ipa0 </data>
+      <data name="rtm_rmnet_data_enabled" type="int"> 1 </data>
+      <data name="rmnet_offload" type="int"> 0 </data>
+      <data name="rmnet_shs" type="int"> 0 </data>
+      <data name="uplink_priority" type="int"> 0 </data>
+      <data name="iwlan_concurrency" type="int"> 1 </data>
+      <data name="nl_xfrm" type="int"> 1 </data>
+      <data name="netdev_max_backlog" type="int"> 100000 </data>
+      <data name="debug_netdev_max_backlog" type="int"> 1500 </data>
+
+      <data name="disable_tcp_hystart_detect" type="int"> 1 </data>
+      <data name="disable_hystart" type="int"> 1 </data>
+      <data name="initial_ssthresh" type="int"> 1400 </data>
+      <data name="dl_marker_enabled" type="int"> 2 </data>
+      <data name="pnd_rps_mask" type="int"> 2 </data>
+      <data name="vnd_rps_mask" type="int"> 125 </data>
+      <data name="qos_via_idl" type="int"> 1 </data>
+      <data name="max_mtu" type="int"> 9216 </data>
+      <data name="netmgr_recovery_enabled" type="int"> 1 </data>
+      <data name="num_modems" type="int"> 2 </data>
+      <list name="modems_enabled">
+      <data type="int"> 1 </data> <!-- MODEM_MSM -->
+      <data type="int"> 0 </data> <!-- MODEM_MDM -->
+      </list>
+
+      <data name="control_ports_len" type="int"> 17 </data>
+      <list name="control_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+        <data type="string"> rmnet_data8 </data>
+        <data type="string"> rmnet_data9 </data>
+        <data type="string"> rmnet_data10 </data>
+        <data type="string"> rmnet_data11 </data>
+        <data type="string"> rmnet_data12 </data>
+        <data type="string"> rmnet_data13 </data>
+        <data type="string"> rmnet_data14 </data>
+        <data type="string"> rmnet_data15 </data>
+        <data type="string"> rmnet_data16 </data>
+      </list>
+
+      <data name="data_ports_len" type="int"> 17 </data>
+      <list name="data_ports">
+        <data type="string"> rmnet_data0 </data>
+        <data type="string"> rmnet_data1 </data>
+        <data type="string"> rmnet_data2 </data>
+        <data type="string"> rmnet_data3 </data>
+        <data type="string"> rmnet_data4 </data>
+        <data type="string"> rmnet_data5 </data>
+        <data type="string"> rmnet_data6 </data>
+        <data type="string"> rmnet_data7 </data>
+        <data type="string"> rmnet_data8 </data>
+        <data type="string"> rmnet_data9 </data>
+        <data type="string"> rmnet_data10 </data>
+        <data type="string"> rmnet_data11 </data>
+        <data type="string"> rmnet_data12 </data>
+        <data type="string"> rmnet_data13 </data>
+        <data type="string"> rmnet_data14 </data>
+        <data type="string"> rmnet_data15 </data>
+        <data type="string"> rmnet_data16 </data>
+      </list>
+      <!-- Number of above data ports inited on bootup -->
+      <data name="static_fwd_links" type="int"> 6 </data>
+
+      <!-- iWLAN ports -->
+      <data name="iwlan_enable" type="int"> 1 </data>
+      <data name="rev_control_ports_len" type="int"> 16 </data>
+      <list name="rev_control_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+        <data type="string"> r_rmnet_data9 </data>
+        <data type="string"> r_rmnet_data10 </data>
+        <data type="string"> r_rmnet_data11 </data>
+        <data type="string"> r_rmnet_data12 </data>
+        <data type="string"> r_rmnet_data13 </data>
+        <data type="string"> r_rmnet_data14 </data>
+        <data type="string"> r_rmnet_data15 </data>
+      </list>
+
+      <data name="rev_data_ports_len" type="int"> 16 </data>
+      <list name="rev_data_ports">
+        <data type="string"> r_rmnet_data0 </data>
+        <data type="string"> r_rmnet_data1 </data>
+        <data type="string"> r_rmnet_data2 </data>
+        <data type="string"> r_rmnet_data3 </data>
+        <data type="string"> r_rmnet_data4 </data>
+        <data type="string"> r_rmnet_data5 </data>
+        <data type="string"> r_rmnet_data6 </data>
+        <data type="string"> r_rmnet_data7 </data>
+        <data type="string"> r_rmnet_data8 </data>
+        <data type="string"> r_rmnet_data9 </data>
+        <data type="string"> r_rmnet_data10 </data>
+        <data type="string"> r_rmnet_data11 </data>
+        <data type="string"> r_rmnet_data12 </data>
+        <data type="string"> r_rmnet_data13 </data>
+        <data type="string"> r_rmnet_data14 </data>
+        <data type="string"> r_rmnet_data15 </data>
+      </list>
+      <!-- Number of above reverse data ports inited on bootup -->
+      <data name="static_rev_links" type="int"> 4 </data>
+   </listitem>
 </list>

proprietary/vendor/etc/default-permissions/com.qualcomm.qti.cne.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2020 Qualcomm Technologies, Inc.
+  ~ All Rights Reserved.
+  ~ Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+
+<!--
+This XML file declares which signature|privileged permissions should be
+granted to privileged applications on QTI devices.
+It allows additional grants on top of privapp-permissions-platform.xml
+-->
+
+<exceptions>
+    <exception package="com.qualcomm.qti.cne">
+        <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
+        <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
+    </exception>
+</exceptions>

proprietary/vendor/etc/init/dpmQmiMgr.rc

@@ -1,9 +1,17 @@
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 
 #start dpmQmiMgr service
 service dpmQmiMgr /system/vendor/bin/dpmQmiMgr
+    interface com.qualcomm.qti.dpm.api@1.0::IdpmQmi dpmQmiService
     class main
     user system
     group system
+    disabled
+
+on property:persist.vendor.dpmhalservice.enable=*
+   start dpmQmiMgr
+
+on property:persist.vendor.dpmhalservice.enable=0
+   stop dpmQmiMgr

proprietary/vendor/etc/init/ims_rtp_daemon_legacy.rc

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
@@ -6,9 +6,8 @@
 # imsdatadaemon starts with root and UID will be downgraded to RADIO.
 service vendor.ims_rtp_daemon /vendor/bin/ims_rtp_daemon
     class main
-    user radio
+    user system
     group radio vendor_qti_diag inet log
 
-
 on property:vendor.ims.DATA_DAEMON_STATUS=1
     restart vendor.ims_rtp_daemon

proprietary/vendor/etc/init/init-qcril-data.rc

@@ -0,0 +1,2 @@
+on property:ro.board.platform=msmnile && property:ro.baseband=msm && property:ro.vendor.qti.va_aosp.support=1
+  setprop ro.telephony.iwlan_operation_mode "legacy"

proprietary/vendor/etc/init/netmgrd.rc

@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
 # All Rights Reserved.
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #
@@ -12,6 +12,12 @@ on boot
     write /proc/sys/net/core/rmem_max  16777216
     write /proc/sys/net/core/wmem_max  8388608
 
+    #Load rmnet_core driver
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules rmnet_ctl
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules rmnet_core
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki rmnet_ctl
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki rmnet_core
+
 # msm specific files that need to be created on /data
 on post-fs-data
     #Create NETMGR daemon log dir
@@ -35,20 +41,37 @@ on property:ro.vendor.use_data_netmgrd=false
     # netmgr not supported on specific target
     stop vendor.netmgrd
 
+on property:ro.baseband=apq
+    stop vendor.netmgrd
+
 on property:persist.vendor.data.shs_ko_load=1
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules rmnet_shs
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki rmnet_shs
 
 on property:persist.vendor.data.shs_ko_load=0
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules rmnet_shs
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules/5.4-gki rmnet_shs
 
 on property:persist.vendor.data.perf_ko_load=3
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -d /vendor/lib/modules rmnet_perf rmnet_perf_ingress_deag=N
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -d /vendor/lib/modules/5.4-gki rmnet_perf rmnet_perf_ingress_deag=N
 
 on property:persist.vendor.data.perf_ko_load=2
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -d /vendor/lib/modules rmnet_perf rmnet_perf_opt_mode="udp"
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -d /vendor/lib/modules/5.4-gki rmnet_perf rmnet_perf_opt_mode="udp"
 
 on property:persist.vendor.data.perf_ko_load=1
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules rmnet_perf
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki rmnet_perf
 
 on property:persist.vendor.data.perf_ko_load=0
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules rmnet_perf
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules/5.4-gki rmnet_perf
+
+on property:persist.vendor.data.offload_ko_load=1
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules rmnet_offload
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki rmnet_offload
+
+on property:persist.vendor.data.offload_ko_load=0
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules rmnet_offload
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -r -d /vendor/lib/modules/5.4-gki rmnet_offload

proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc

@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+service vendor.rmt_storage /vendor/bin/rmt_storage
+    class core
+    user root
+    shutdown critical
+    ioprio rt 0

proprietary/vendor/etc/init/vendor.qti.tftp.rc

@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+# Create pddump directory
+on post-fs-data
+	mkdir /data/vendor/pddump 0770 oem_2903 oem_2903
+
+service vendor.tftp_server /vendor/bin/tftp_server
+   class core
+   user root

proprietary/vendor/etc/seccomp_policy/imsrtp.policy

@@ -0,0 +1,95 @@
+#Copyright (c) 2020 Qualcomm Technologies, Inc.
+#All Rights Reserved.
+#Confidential and Proprietary - Qualcomm Technologies, Inc
+
+#Not a contribution.
+
+#Copyright (C) 2018 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.
+
+mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+munmap: 1
+mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+#prctl: arg0 == PR_SET_VMA || arg0 == PR_SET_NO_NEW_PRIVS || arg0 == PR_GET_DUMPABLE || arg0 == PR_SET_SECCOMP || arg0 == 0x37 /* PR_??? */
+prctl: 1
+read: 1
+openat: 1
+close: 1
+shutdown: 1
+kill: 1
+futex: 1
+fstat: 1
+gettimeofday: 1
+readlinkat: 1
+newfstatat: 1
+mremap: 1
+pread64: 1
+fstatfs: 1
+rt_sigaction: 1
+faccessat: 1
+socket: arg0 == AF_UNIX || arg0 == AF_QIPCRTR
+writev: 1
+connect: 1
+rt_sigprocmask: 1
+fcntl: 1
+sendto: 1
+getrandom: 1
+lseek: 1
+exit_group: 1
+rt_tgsigqueueinfo: 1
+write: 1
+exit: 1
+getpid: 1
+sigaltstack: 1
+recvmsg: 1
+dup: 1
+getrlimit: 1
+restart_syscall: 1
+clone: 1
+gettid: 1
+sched_getscheduler: 1
+ioctl: 1
+execve: 1
+getuid: 1
+madvise: 1
+set_tid_address: 1
+nanosleep: 1
+rt_sigreturn: 1
+rt_sigsuspend: 1
+setpriority: 1
+geteuid: 1
+getgid: 1
+getegid: 1
+getgroups: 1
+pipe2: 1
+setitimer: 1
+pselect6: 1
+getsockname: 1
+recvfrom: 1
+ppoll: 1
+socketpair: 1
+setsockopt: 1
+getsockopt: 1
+sendmsg: 1
+bind: 1
+timer_create: 1
+timer_settime: 1
+timer_delete: 1
+clock_gettime: 1
+sched_getaffinity: 1
+#crash dump policy addition
+socket: 1
+process_vm_readv: 1
+tgkill: 1
+