sdm660-common: Checkout RIL Related Blobs from curtana V12.0.1.0.RJWINXM

Signed-off-by: Kunmun <kunmun.devroms@gmail.com>

sdm660-common/Android.bp

@@ -44,6 +44,91 @@ cc_prebuilt_library_shared {
 	product_specific: true,
 }
 
+cc_prebuilt_library_shared {
+	name: "com.quicinc.cne.api@1.0",
+	owner: "asus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.api@1.0.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.quicinc.cne.api@1.1",
+	owner: "asus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.api@1.1.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.quicinc.cne.constants@1.0",
+	owner: "asus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.constants@1.0.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.quicinc.cne.constants@2.0",
+	owner: "asus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.constants@2.0.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+	name: "com.quicinc.cne.constants@2.1",
+	owner: "asus",
+	strip: {
+		none: true,
+	},
+	target: {
+		android_arm64: {
+			srcs: ["proprietary/system_ext/lib64/com.quicinc.cne.constants@2.1.so"],
+		},
+	},
+	compile_multilib: "64",
+	check_elf_files: false,
+	prefer: true,
+	system_ext_specific: true,
+}
+
 android_app_import {
 	name: "WfdService",
 	owner: "asus",
@@ -100,83 +185,94 @@ android_app_import {
 }
 
 android_app_import {
-	name: "QtiTelephonyService",
+	name: "DeviceInfo",
 	owner: "asus",
-	apk: "proprietary/product/app/QtiTelephonyService/QtiTelephonyService.apk",
+	apk: "proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "QtiTelephonyService",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "datastatusnotification",
 	owner: "asus",
-	apk: "proprietary/product/app/datastatusnotification/datastatusnotification.apk",
+	apk: "proprietary/system_ext/app/datastatusnotification/datastatusnotification.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
+	system_ext_specific: true,
+}
+
+android_app_import {
+	name: "embms",
+	owner: "asus",
+	apk: "proprietary/system_ext/app/embms/embms.apk",
+	certificate: "platform",
+	dex_preopt: {
+		enabled: false,
+	},
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "imssettings",
 	owner: "asus",
-	apk: "proprietary/product/app/imssettings/imssettings.apk",
+	apk: "proprietary/system_ext/app/imssettings/imssettings.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "uceShimService",
-	owner: "asus",
-	apk: "proprietary/product/app/uceShimService/uceShimService.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "dpmserviceapp",
 	owner: "asus",
-	apk: "proprietary/product/priv-app/dpmserviceapp/dpmserviceapp.apk",
+	apk: "proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
 	privileged: true,
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "ims",
 	owner: "asus",
-	apk: "proprietary/product/priv-app/ims/ims.apk",
+	apk: "proprietary/system_ext/priv-app/ims/ims.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
 	privileged: true,
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "qcrilmsgtunnel",
 	owner: "asus",
-	apk: "proprietary/product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
+	apk: "proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
 	privileged: true,
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 dex_import {

sdm660-common/proprietary/product/etc/permissions/dpmapi.xml

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

sdm660-common/proprietary/system/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>

sdm660-common/proprietary/system/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>

sdm660-common/proprietary/system/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>

sdm660-common/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.
 
@@ -9,9 +9,15 @@ on post-fs-data
     chown system system /data/dpm
 
 #start dpmd service
-service dpmd /system/product/bin/dpmd
+service dpmd /system/system_ext/bin/dpmd
     class late_start
     socket dpmd stream 660 root radio
     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

sdm660-common/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/product/framework/com.qti.dpmframework.jar"/>
+        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>

sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml

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

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

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

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

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

sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice.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="com.qualcomm.qti.imscmservice@1.0-java"
+            file="/system/framework/com.qualcomm.qti.imscmservice@1.0-java.jar" />
+</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/dpmapi.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--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"/>
+</permissions>

sdm660-common/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>

sdm660-common/proprietary/system_ext/etc/permissions/qcrilhook.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <permissions>
  <library name="com.qualcomm.qcrilhook"
-          file="/product/framework/qcrilhook.jar"
+          file="/system_ext/framework/qcrilhook.jar"
           dependency="qti-telephony-utils:qti-telephony-hidl-wrapper" />
 </permissions>

sdm660-common/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>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2019 Qualcomm Technologies, Inc.
+  ~ Copyright (c) 2020 Qualcomm Technologies, Inc.
   ~ All Rights Reserved.
   ~ Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -35,10 +35,6 @@ 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"/>
@@ -49,20 +45,16 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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"/>
+        <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"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.qti.carrierswitch">
-        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS" />
     </privapp-permissions>
 
     <privapp-permissions package="com.android.mms">
@@ -79,8 +71,12 @@ 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.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml

@@ -7,5 +7,5 @@ Qualcomm Technologies Proprietary and Confidential.
 
 <permissions>
 <library name="com.qualcomm.qti.QtiTelephonyServicelibrary"
-         file="/system/product/framework/QtiTelephonyServicelibrary.jar"/>
+         file="/system/system_ext/framework/QtiTelephonyServicelibrary.jar"/>
 </permissions>