sm6225-common: Update to devon_g T2SN33.73-22-3

Change-Id: Ie0ace50d0de5e35c82c51b577e7e8844ac8c9ad4

Android.bp

@@ -215,6 +215,20 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.factory-V2.1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.factory-V2.2-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.rcssip-V1.0-java",
 	owner: "motorola",
@@ -222,6 +236,20 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "vendor.qti.ims.rcssip-V1.1-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcssip-V1.2-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.ims.rcsuce-V1.0-java",
 	owner: "motorola",
@@ -229,13 +257,18 @@ dex_import {
 	system_ext_specific: true,
 }
 
-prebuilt_etc_xml {
-	name: "android.hardware.neuralnetworks@1.3-service-qti",
+dex_import {
+	name: "vendor.qti.ims.rcsuce-V1.1-java",
 	owner: "motorola",
-	src: "proprietary/vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml",
-	filename_from_src: true,
-	sub_dir: "vintf/manifest",
-	soc_specific: true,
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "vendor.qti.ims.rcsuce-V1.2-java",
+	owner: "motorola",
+	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"],
+	system_ext_specific: true,
 }
 
 prebuilt_etc_xml {

proprietary/etc/sysconfig/qti_whitelist.xml

@@ -106,7 +106,6 @@
     <hidden-api-whitelisted-app package="com.android.bluetooth" />
     <hidden-api-whitelisted-app package="org.codeaurora.bluetooth" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.qmmi" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.perfdump" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.client" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.server.wigigapp" />

proprietary/system_ext/etc/permissions/moto-telephony.xml

@@ -14,6 +14,9 @@
     limitations under the License.
 -->
 <permissions>
-    <library name="moto-telephony" file="/system_ext/framework/moto-telephony.jar"/>
+    <library
+        name="moto-telephony"
+        file="/system_ext/framework/moto-telephony.jar"
+    />
 </permissions>
 

proprietary/system_ext/etc/permissions/privapp-permissions-qti-system-ext.xml

@@ -31,6 +31,11 @@ It allows additional grants on top of privapp-permissions-platform.xml
 
     <privapp-permissions package="com.qualcomm.qti.services.systemhelper">
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MANAGE_USERS"/>
     </privapp-permissions>
 
+    <privapp-permissions package="com.skyhook.blp">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
 </permissions>

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

@@ -46,6 +46,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
         <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.ims">

proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml

@@ -1,6 +1,6 @@
 <!--
 /*********************************************************************
- Copyright (c) 2021 Qualcomm Technologies, Inc.
+ Copyright (c) 2021-2022 Qualcomm Technologies, Inc.
  All Rights Reserved.
  Confidential and Proprietary - Qualcomm Technologies, Inc.
 **********************************************************************/
@@ -14,4 +14,16 @@
         file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar"/>
     <library name="vendor.qti.ims.rcssip-V1.0-java"
         file="/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar"/>
+    <library name="vendor.qti.ims.factory-V2.1-java"
+        file="/system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar"/>
+    <library name="vendor.qti.ims.rcsuce-V1.1-java"
+        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar"/>
+    <library name="vendor.qti.ims.rcssip-V1.1-java"
+        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar"/>
+    <library name="vendor.qti.ims.factory-V2.2-java"
+        file="/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar"/>
+    <library name="vendor.qti.ims.rcsuce-V1.2-java"
+        file="/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"/>
+    <library name="vendor.qti.ims.rcssip-V1.2-java"
+        file="/system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar"/>
 </permissions>

proprietary/system_ext/etc/seccomp_policy/wfdservice.policy

@@ -76,3 +76,4 @@ getdents64: 1
 dup: 1
 lseek: 1
 tgkill: 1
+process_vm_readv: 1

proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <!--
-  Copyright (c) 2020 Qualcomm Technologies, Inc.
+  Copyright (c) 2021 Qualcomm Technologies, Inc.
   All Rights Reserved.
   Confidential and Proprietary - Qualcomm Technologies, Inc.
 -->
@@ -26,18 +26,81 @@ Full documentation at frameworks/base/data/etc/preinstalled-packages-platform.xm
 -->
 
 <config>
-    <install-in-user-type package="org.codeaurora.ims">
+
+    <!-- qcrilOemHook -->
+
+    <install-in-user-type package="com.qualcomm.qcrilmsgtunnel">
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
+
+    <!-- telephony-apps -->
+
+    <install-in-user-type package="com.qti.telephonysettings">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.atfwd">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.callfeaturessetting">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
     <install-in-user-type package="com.qualcomm.qti.confdialer">
         <install-in user-type="SYSTEM" />
         <install-in user-type="FULL" />
         <install-in user-type="PROFILE" />
     </install-in-user-type>
-    <install-in-user-type package="com.qualcomm.qti.telephonyservice">
-        <install-in user-type="SYSTEM" />
-    </install-in-user-type>
+
     <install-in-user-type package="com.qti.qualcomm.datastatusnotification">
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
+
+    <install-in-user-type package="com.qti.qualcomm.deviceinfo">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="org.codeaurora.ims">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="org.codeaurora.qti.nrNetworkSettingApp">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.telephonyservice">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.sam.service">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qti.xdivert">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+
+    <!-- telephony-internal -->
+
+    <install-in-user-type package="com.qualcomm.qti.imsiprivacy.tests">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <!-- telephony-noship -->
+
+    <install-in-user-type package="com.qualcomm.qti.devicestatisticsservice">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.embms">
+        <install-in user-type="SYSTEM" />
+    </install-in-user-type>
+
+    <install-in-user-type package="com.qualcomm.qti.euiccresource">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+
  </config>

proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml

@@ -31,6 +31,10 @@
 -->
 
 <config>
-<!-- Broadcast actions that are currently whitelisted. -->
-<allow-implicit-broadcast action="org.codeaurora.intent.action.PRE_ALERTING_CALL_INFO" />
+    <!-- Broadcast actions that are currently whitelisted. -->
+    <allow-implicit-broadcast action="org.codeaurora.intent.action.PRE_ALERTING_CALL_INFO" />
+    <!-- These are location components that need to freely run in the background -->
+    <allow-in-power-save package="com.qualcomm.location" />
+    <hidden-api-whitelisted-app package="com.qualcomm.location" />
+    <hidden-api-whitelisted-app package="com.skyhook.blp" />
 </config>