sdm660-common: Update RIL blobs from curtana V12.0.1.7.RJWMIXM

Android.bp

@@ -170,6 +170,17 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "DeviceInfo",
+	owner: "xiaomi",
+	apk: "proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "QtiTelephonyService",
 	owner: "xiaomi",
@@ -181,6 +192,17 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "atfwd",
+	owner: "xiaomi",
+	apk: "proprietary/system_ext/app/atfwd/atfwd.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "datastatusnotification",
 	owner: "xiaomi",
@@ -192,6 +214,17 @@ android_app_import {
 	system_ext_specific: true,
 }
 
+android_app_import {
+	name: "embms",
+	owner: "xiaomi",
+	apk: "proprietary/system_ext/app/embms/embms.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "imssettings",
 	owner: "xiaomi",
@@ -263,9 +296,15 @@ dex_import {
 }
 
 dex_import {
-	name: "QtiTelephonyServicelibrary",
+	name: "tcmclient",
 	owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/QtiTelephonyServicelibrary.jar"],
+	jars: ["proprietary/framework/tcmclient.jar"],
+}
+
+dex_import {
+	name: "com.qti.dpmframework",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"],
 	system_ext_specific: true,
 }
 
@@ -311,6 +350,41 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "com.quicinc.cne.api-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.api-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.api-V1.1-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.api-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.constants-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.constants-V2.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "com.quicinc.cne.constants-V2.1-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/com.quicinc.cne.constants-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "dpmapi",
 	owner: "xiaomi",
@@ -318,6 +392,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",
@@ -325,6 +406,20 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "qti-telephony-common",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/qti-telephony-common.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.data.factory-V2.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.0-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.data.factory-V2.1-java",
 	owner: "xiaomi",
@@ -332,6 +427,62 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.data.slm-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.data.slm-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.cne.internal.api-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.cne.internal.constants-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.cne.internal.server-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.connection-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.connection-V1.1-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.dynamicdds-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.hardware.data.iwlan-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.hardware.data.latency-V1.0-java",
 	owner: "xiaomi",
@@ -339,6 +490,13 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.hardware.data.qmi-V1.0-java",
+	owner: "xiaomi",
+	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.callcapability-V1.0-java",
 	owner: "xiaomi",
@@ -375,16 +533,16 @@ dex_import {
 }
 
 dex_import {
-	name: "com.qti.dpmframework",
+	name: "vendor.qti.ims.rcsconfig-V2.0-java",
 	owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"],
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.0-java.jar"],
 	system_ext_specific: true,
 }
 
 dex_import {
-	name: "qti-telephony-common",
+	name: "vendor.qti.ims.rcsconfig-V2.1-java",
 	owner: "xiaomi",
-	jars: ["proprietary/system_ext/framework/qti-telephony-common.jar"],
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsconfig-V2.1-java.jar"],
 	system_ext_specific: true,
 }
 

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/product/etc/permissions/telephony_product_privapp-permissions-qti.xml

@@ -35,52 +35,12 @@ It allows additional grants on top of privapp-permissions-platform.xml
 
 <permissions>
 
-    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-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"/>
-    </privapp-permissions>
-
     <privapp-permissions package="org.codeaurora.qti.qtiNetworkApp">
         <permission name="android.permission.MODIFY_PHONE_STATE"/>
     </privapp-permissions>
 
-    <privapp-permissions package="org.codeaurora.ims">
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-    </privapp-permissions>
-
     <privapp-permissions package="com.qualcomm.qti.carrierswitch">
         <permission name="android.permission.REBOOT"/>
     </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="org.codeaurora.qti.nrNetworkSettingApp">
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
 </permissions>

proprietary/system_ext/etc/init/dpmd.rc

@@ -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,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2015-2020 Qualcomm Technologies, Inc.
+<!--Copyright (c) 2015-2016, 2020 Qualcomm Technologies, Inc.
     All Rights Reserved.
     Confidential and Proprietary - Qualcomm Technologies, Inc.-->
 <permissions>

proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Copyright (c) 2020 Qualcomm Technologies, Inc.
+<!-- Copyright (c) 2018-2020 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc. -->
 

proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- Copyright (c) 2020 Qualcomm Technologies, Inc.
+<!-- Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
      All Rights Reserved.
      Confidential and Proprietary - Qualcomm Technologies, Inc. -->
 

proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice.xml

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

proprietary/system_ext/etc/permissions/dpmapi.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2014, 2020 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/telephony_system-ext_privapp-permissions-qti.xml

@@ -48,10 +48,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
     </privapp-permissions>
 
-    <privapp-permissions package="org.codeaurora.qti.qtiNetworkApp">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-    </privapp-permissions>
-
     <privapp-permissions package="org.codeaurora.ims">
         <permission name="android.permission.MODIFY_PHONE_STATE"/>
         <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
@@ -61,19 +57,11 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.WRITE_SECURE_SETTINGS" />
     </privapp-permissions>
 
-    <privapp-permissions package="com.qualcomm.qti.carrierswitch">
-        <permission name="android.permission.REBOOT"/>
-    </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.qcrilmsgtunnel">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
     <privapp-permissions package="com.qualcomm.qti.callenhancement">
         <permission name="android.permission.RECORD_AUDIO" />
         <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
@@ -83,6 +71,10 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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>

proprietary/system_ext/etc/permissions/telephonyservice.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright (c) 2014, 2020 Qualcomm Technologies, Inc.  All Rights Reserved.
+Copyright (c) 2014 Qualcomm Technologies, Inc.  All Rights Reserved.
 Qualcomm Technologies Proprietary and Confidential.
 -->