sdm660-common: update DPM blobs from Pixel 5a (barbet) UP1A.231105.001/10817346

sdm660-common/Android.bp

@@ -196,18 +196,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-android_app_import {
-	name: "dpmserviceapp",
-	owner: "asus",
-	apk: "proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "ims",
 	owner: "asus",

sdm660-common/proprietary/system_ext/etc/dpm/dpm.conf

@@ -1,78 +0,0 @@
-#configuration parameters for DPM Fast Dormancy and TCM module.
-
-#Configuration params for FD slot 0
-#delay_time while issuing dormancy_request
-dpm_s0_fd_delay_time_timer_value:0
-#Idle timer value when SCREEN state is ON
-#dpm_fd_screen_on_idle_timer_value = actual_screen_on_timer + delay_time
-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: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
-dpm_s0_fd_tethering_on_idle_timer_value:15
-#FastDormancy can be configured for a network type
-#Default configuration 101000011100001000
-dpm_s0_fd_enable_networks_mask:0x28708
-
-#Configuration params for FD slot 1
-#delay_time while issuing dormancy_request
-dpm_s1_fd_delay_time_timer_value:0
-#Idle timer value when SCREEN state is ON
-#dpm_fd_screen_on_idle_timer_value = actual_screen_on_timer + delay_time
-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: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
-dpm_s1_fd_tethering_on_idle_timer_value:15
-#FastDormancy can be configured for a network type
-#Default configuration 101000011100001000
-dpm_s1_fd_enable_networks_mask:0x28708
-
-#Configuration params for TCM
-#Idle timer value when SCREEN state is ON
-#min : 1s and max :256s
-dpm_tcm_screen_on_idle_timer_value:5
-#Idle timer value when SCREEN state is OFF
-#min : 0s and max :256s, tcm is disabled with screen off state
-dpm_tcm_screen_off_idle_timer_value:0
-#TCM can be configured for a network type
-#Default configuration 11111111111111111110
-dpm_tcm_enable_networks_mask:0xFFFFE
-
-
-#FastDormancy and TCM can be configured for a network type
-#NETWORK_TYPE_UNKNOWN = 0
-#NETWORK_TYPE_GPRS = 1
-#NETWORK_TYPE_EDGE = 2
-#NETWORK_TYPE_UMTS = 3
-#NETWORK_TYPE_CDMA = 4
-#NETWORK_TYPE_EVDO_0 = 5
-#NETWORK_TYPE_EVDO_A = 6
-#NETWORK_TYPE_1xRTT = 7
-#NETWORK_TYPE_HSDPA = 8
-#NETWORK_TYPE_HSUPA = 9
-#NETWORK_TYPE_HSPA = 10
-#NETWORK_TYPE_IDEN = 11
-#NETWORK_TYPE_EVDO_B = 12
-#NETWORK_TYPE_LTE = 13
-#NETWORK_TYPE_EHRPD = 14
-#NETWORK_TYPE_HSPAP = 15
-#NETWORK_TYPE_GSM = 16
-#NETWORK_TYPE_TD_SCDMA = 17
-#NETWORK_TYPE_IWLAN = 18
-#NETWORK_TYPE_LTE_CA = 19;
-
-#configuration params for Dormancy manager
-#first larger inactivity soft timer to poll for dormancy in seconds.
-dpm_dm_t1_inactivity_timer:15
-#second smaller inactivity soft timer to poll for dormancy in seconds.
-dpm_dm_t2_inactivity_timer:5
-#number of times T2 can be repeated before registering for dormancy indication with modem directly.
-dpm_dm_repeat_t2:5
-

sdm660-common/proprietary/system_ext/etc/init/dpmd.rc

@@ -1,23 +0,0 @@
-# Copyright (c) 2018 - 2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-# Create the directories used by DPM subsystem
-
-on post-fs-data
-    mkdir /data/dpm 0771 system system
-    chown system system /data/dpm
-
-#start dpmd service
-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/dpmapi.xml

@@ -1,8 +1,8 @@
 <?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="com.qti.dpmapi"
+    <library name="dpmapi"
         file="/system/system_ext/framework/dpmapi.jar"/>
 </permissions>

sdm660-common/sdm660-common-vendor.mk

@@ -6,10 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/asus/sdm660-common
 
 PRODUCT_COPY_FILES += \
-    vendor/asus/sdm660-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/cdma_call_conf.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/cdma_call_conf.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/RemoteSimlock.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/RemoteSimlockManager.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/UimGba.xml \
@@ -126,7 +123,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
     vendor/asus/sdm660-common/proprietary/vendor/bin/cnd:$(TARGET_COPY_OUT_VENDOR)/bin/cnd \
     vendor/asus/sdm660-common/proprietary/vendor/bin/cnss-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/cnss-daemon \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/dpmQmiMgr:$(TARGET_COPY_OUT_VENDOR)/bin/dpmQmiMgr \
     vendor/asus/sdm660-common/proprietary/vendor/bin/dspservice:$(TARGET_COPY_OUT_VENDOR)/bin/dspservice \
     vendor/asus/sdm660-common/proprietary/vendor/bin/garden_app:$(TARGET_COPY_OUT_VENDOR)/bin/garden_app \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hvdcp_opti:$(TARGET_COPY_OUT_VENDOR)/bin/hvdcp_opti \
@@ -213,7 +209,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/dataqti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataqti.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/dpmQmiMgr.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dpmQmiMgr.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/ims_rtp_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ims_rtp_daemon.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/imsdatadaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdatadaemon.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/imsqmidaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsqmidaemon.rc \
@@ -694,7 +689,6 @@ PRODUCT_PACKAGES += \
     uimremoteclient \
     uimremoteserver \
     xdivert \
-    dpmserviceapp \
     ims \
     qcrilmsgtunnel \
     tcmclient \