sync with kb2003_11_C.21

Change-Id: I7203c01b2ac7de81b18bdee6d9b828b5146e9e3e

proprietary/system/etc/sysconfig/qti_whitelist.xml

@@ -47,6 +47,7 @@
     <allow-in-power-save package="com.android.email" />
     <allow-in-power-save package="com.qualcomm.qti.callenhancement" />
     <allow-in-power-save package="com.qualcomm.qti.smartassistant" />
+    <allow-in-power-save package="com.qti.xdivert" />
     <!-- These telephony applications need access to non-[System]SDK APIs -->
     <hidden-api-whitelisted-app package="com.qualcomm.uimremoteserver" />
     <hidden-api-whitelisted-app package="com.qualcomm.uimremoteclient" />
@@ -66,7 +67,6 @@
     <hidden-api-whitelisted-app package="com.qualcomm.qti.radioconfigtest" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.roamingsettings" />
     <hidden-api-whitelisted-app package="com.qualcomm.simcontacts" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.simsettings" />
     <hidden-api-whitelisted-app package="org.codeaurora.ims" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.ims" />
     <hidden-api-whitelisted-app package="com.qti.xdivert" />
@@ -99,7 +99,6 @@
     <hidden-api-whitelisted-app package="com.example.connmgr" />
     <hidden-api-whitelisted-app package="com.android.email" />
     <hidden-api-whitelisted-app package="com.cyanogenmod.filemanager" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.presenceappSub2" />
     <hidden-api-whitelisted-app package="com.qualcomm.secureindicator" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.sysmonappExternal" />
     <hidden-api-whitelisted-app package="com.qualcomm.qti.biometrics.voiceprint.voiceprintdemo" />
@@ -114,5 +113,6 @@
     <!-- These are location components that need to freely run in the background -->
     <allow-in-power-save package="com.qualcomm.location" />
     <allow-in-power-save package="com.qualcomm.location.XT" />
+    <allow-in-power-save package="com.qualcomm.location.XT.setup" />
     <hidden-api-whitelisted-app package="com.qti.service.colorservice" />
 </config>

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/dpmapi.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2014, 2019-2020 Qualcomm Technologies, Inc.
+<!--Copyright (c) 2014, 2019-2021 Qualcomm Technologies, Inc.
     All Rights Reserved.
     Confidential and Proprietary - Qualcomm Technologies, Inc.-->
 <permissions>
+    <library name="dpmapi"
+        file="/system/system_ext/framework/dpmapi.jar"/>
+   <!-- ifdef OPLUS_DATA_FAST_DORMANCY -->
+   <!-- MengXiangPeng@NETWORK.DATA.1610480, 2021/6/15, use sim card to load carrierconfig's fastdormancy four time parameter [OCR.527003.3.OM] -->
     <library name="com.qti.dpmapi"
         file="/system/system_ext/framework/dpmapi.jar"/>
+   <!-- endif OPLUS_DATA_FAST_DORMANCY -->
 </permissions>