diff --git a/Android.bp b/Android.bp index ddd8c4b..2173140 100644 --- a/Android.bp +++ b/Android.bp @@ -106,18 +106,6 @@ android_app_import { system_ext_specific: true, } -android_app_import { - name: "dpmserviceapp", - owner: "xiaomi", - 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: "xiaomi", @@ -154,6 +142,18 @@ android_app_import { system_ext_specific: true, } +android_app_import { + name: "dpmserviceapp", + owner: "xiaomi", + apk: "proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + dex_import { name: "WfdCommon", owner: "xiaomi", @@ -173,20 +173,6 @@ dex_import { system_ext_specific: true, } -dex_import { - name: "com.qti.dpmframework", - owner: "xiaomi", - jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"], - system_ext_specific: true, -} - -dex_import { - name: "dpmapi", - owner: "xiaomi", - jars: ["proprietary/system_ext/framework/dpmapi.jar"], - system_ext_specific: true, -} - dex_import { name: "qcrilhook", owner: "xiaomi", @@ -208,3 +194,17 @@ dex_import { system_ext_specific: true, } +dex_import { + name: "com.qti.dpmframework", + owner: "xiaomi", + jars: ["proprietary/system_ext/framework/com.qti.dpmframework.jar"], + system_ext_specific: true, +} + +dex_import { + name: "dpmapi", + owner: "xiaomi", + jars: ["proprietary/system_ext/framework/dpmapi.jar"], + system_ext_specific: true, +} + diff --git a/proprietary/system_ext/bin/dpmd b/proprietary/system_ext/bin/dpmd index abd89c9..efa3309 100755 Binary files a/proprietary/system_ext/bin/dpmd and b/proprietary/system_ext/bin/dpmd differ diff --git a/proprietary/system_ext/etc/init/dpmd.rc b/proprietary/system_ext/etc/init/dpmd.rc index 529ceb5..4633e38 100644 --- a/proprietary/system_ext/etc/init/dpmd.rc +++ b/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. @@ -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 diff --git a/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml b/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml index 65a086e..466ed4e 100644 --- a/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml +++ b/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml @@ -1,10 +1,12 @@ - + diff --git a/proprietary/system_ext/etc/permissions/dpmapi.xml b/proprietary/system_ext/etc/permissions/dpmapi.xml index c10e080..b718492 100644 --- a/proprietary/system_ext/etc/permissions/dpmapi.xml +++ b/proprietary/system_ext/etc/permissions/dpmapi.xml @@ -1,6 +1,13 @@ - + + + + + diff --git a/proprietary/system_ext/framework/com.qti.dpmframework.jar b/proprietary/system_ext/framework/com.qti.dpmframework.jar index 15c8073..be4c147 100644 Binary files a/proprietary/system_ext/framework/com.qti.dpmframework.jar and b/proprietary/system_ext/framework/com.qti.dpmframework.jar differ diff --git a/proprietary/system_ext/framework/dpmapi.jar b/proprietary/system_ext/framework/dpmapi.jar index 851f343..953b115 100644 Binary files a/proprietary/system_ext/framework/dpmapi.jar and b/proprietary/system_ext/framework/dpmapi.jar differ diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so index 45feac0..8a6d2e4 100644 Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so and b/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so differ diff --git a/proprietary/system_ext/lib64/libdpmctmgr.so b/proprietary/system_ext/lib64/libdpmctmgr.so index 0292e7e..681a7fb 100644 Binary files a/proprietary/system_ext/lib64/libdpmctmgr.so and b/proprietary/system_ext/lib64/libdpmctmgr.so differ diff --git a/proprietary/system_ext/lib64/libdpmfdmgr.so b/proprietary/system_ext/lib64/libdpmfdmgr.so index ecbcdcf..8eb6c9e 100644 Binary files a/proprietary/system_ext/lib64/libdpmfdmgr.so and b/proprietary/system_ext/lib64/libdpmfdmgr.so differ diff --git a/proprietary/system_ext/lib64/libdpmframework.so b/proprietary/system_ext/lib64/libdpmframework.so index f39f47d..54c5456 100644 Binary files a/proprietary/system_ext/lib64/libdpmframework.so and b/proprietary/system_ext/lib64/libdpmframework.so differ diff --git a/proprietary/system_ext/lib64/libdpmtcm.so b/proprietary/system_ext/lib64/libdpmtcm.so index 1ce3526..7303d36 100644 Binary files a/proprietary/system_ext/lib64/libdpmtcm.so and b/proprietary/system_ext/lib64/libdpmtcm.so differ diff --git a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk index c50e455..ec26e03 100644 Binary files a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk and b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk differ diff --git a/proprietary/vendor/bin/dpmQmiMgr b/proprietary/vendor/bin/dpmQmiMgr index 322b7ef..6a5c870 100755 Binary files a/proprietary/vendor/bin/dpmQmiMgr and b/proprietary/vendor/bin/dpmQmiMgr differ diff --git a/proprietary/vendor/etc/init/dpmQmiMgr.rc b/proprietary/vendor/etc/init/dpmQmiMgr.rc index 9637e31..aeb6c5b 100644 --- a/proprietary/vendor/etc/init/dpmQmiMgr.rc +++ b/proprietary/vendor/etc/init/dpmQmiMgr.rc @@ -1,9 +1,17 @@ -# Copyright (c) 2019 Qualcomm Technologies, Inc. +# Copyright (c) 2019-2020 Qualcomm Technologies, Inc. # All Rights Reserved. # Confidential and Proprietary - Qualcomm Technologies, Inc. #start dpmQmiMgr service service dpmQmiMgr /system/vendor/bin/dpmQmiMgr + interface com.qualcomm.qti.dpm.api@1.0::IdpmQmi dpmQmiService class main user system group system + disabled + +on property:persist.vendor.dpmhalservice.enable=* + start dpmQmiMgr + +on property:persist.vendor.dpmhalservice.enable=0 + stop dpmQmiMgr diff --git a/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so b/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so index 742b5d1..f46b132 100644 Binary files a/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so and b/proprietary/vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so differ diff --git a/proprietary/vendor/lib64/libdpmqmihal.so b/proprietary/vendor/lib64/libdpmqmihal.so index 17c5390..f6cb9e6 100644 Binary files a/proprietary/vendor/lib64/libdpmqmihal.so and b/proprietary/vendor/lib64/libdpmqmihal.so differ diff --git a/sdm845-common-vendor.mk b/sdm845-common-vendor.mk index 1968c57..3eb5469 100644 --- a/sdm845-common-vendor.mk +++ b/sdm845-common-vendor.mk @@ -6,14 +6,8 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/xiaomi/sdm845-common PRODUCT_COPY_FILES += \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \ vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \ vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@1.0.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@2.0.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@2.1.so \ @@ -26,10 +20,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtutils.so \ vendor/xiaomi/sdm845-common/proprietary/product/lib64/libaptXHD_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptXHD_encoder.so \ vendor/xiaomi/sdm845-common/proprietary/product/lib64/libaptX_encoder.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libaptX_encoder.so \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmctmgr.so \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmfdmgr.so \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdpmframework.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmframework.so \ - vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmtcm.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.0.so \ @@ -46,9 +36,14 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_libpermissions.xml \ vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.so \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \ vendor/xiaomi/sdm845-common/proprietary/system_ext/bin/wfdservice:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/wfdservice \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \ vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \ vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \ vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/seccomp_policy/wfdservice.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice.policy \ vendor/xiaomi/sdm845-common/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/com.qualcomm.qti.wifidisplayhal@1.0.so \ @@ -73,6 +68,11 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib/libwfduibcsrc.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrc.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib/libwfduibcsrcinterface.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libwfduibcsrcinterface.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/vendor.qti.hardware.wifidisplaysession@1.0.so \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmctmgr.so \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmfdmgr.so \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdpmframework.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmframework.so \ + vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmtcm.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmosal.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmparser_lite.so \ vendor/xiaomi/sdm845-common/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \ @@ -774,15 +774,15 @@ PRODUCT_PACKAGES += \ HotwordEnrollmentXGoogleWCD9340 \ QtiTelephonyService \ uceShimService \ - dpmserviceapp \ ims \ qcrilmsgtunnel \ WfdService \ + dpmserviceapp \ WfdCommon \ audiosphere \ QtiTelephonyServicelibrary \ - com.qti.dpmframework \ - dpmapi \ qcrilhook \ qti-telephony-common \ - com.android.hotwordenrollment.common.util + com.android.hotwordenrollment.common.util \ + com.qti.dpmframework \ + dpmapi