diff --git a/Android.mk b/Android.mk
index 8cdfad70..e7726f27 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,13 +70,13 @@ $(DSP_MOUNT_POINT):
ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
-IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so
-IMS_SYMLINKS := $(addprefix $(TARGET_OUT_PRODUCT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
+IMS_LIBS := lib-imscamera.so libimscamera_jni.so libimsmedia_jni.so
+IMS_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
$(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
@echo "IMS lib link: $@"
@mkdir -p $(dir $@)
@rm -rf $@
- $(hide) ln -sf /system/product/lib64/$(notdir $@) $@
+ $(hide) ln -sf /system/system_ext/lib64/$(notdir $@) $@
ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS)
diff --git a/configs/privapp-permission/privapp-permissions-qti-product.xml b/configs/privapp-permission/privapp-permissions-qti-system-ext.xml
similarity index 68%
rename from configs/privapp-permission/privapp-permissions-qti-product.xml
rename to configs/privapp-permission/privapp-permissions-qti-system-ext.xml
index e3030fbc..9b14e299 100644
--- a/configs/privapp-permission/privapp-permissions-qti-product.xml
+++ b/configs/privapp-permission/privapp-permissions-qti-system-ext.xml
@@ -1,6 +1,6 @@
@@ -33,12 +33,15 @@ It allows additional grants on top of privapp-permissions-platform.xml
-
+
-
-
-
+
+
+
+
+
+
diff --git a/extract-files.sh b/extract-files.sh
index 54f7ff31..fa18c47a 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -74,9 +74,30 @@ fi
function blob_fixup() {
case "${1}" in
- product/lib64/libdpmframework.so)
+ system_ext/lib64/libdpmframework.so)
"$PATCHELF" --add-needed libcutils_shim.so "${2}"
;;
+
+ system_ext/etc/init/dpmd.rc)
+ sed -i "s|/system/product/bin/|/system/system_ext/bin/|g" "${2}"
+ ;;
+
+ system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml | system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml | system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml)
+ sed -i 's|product|system_ext|g' "${2}"
+ ;;
+
+ system_ext/etc/permissions/com.qti.dpmframework.xml | system_ext/etc/permissions/com.qualcomm.qti.imscmservice.xml | system_ext/etc/permissions/dpmapi.xml | system_ext/etc/permissions/telephonyservice.xml)
+ sed -i "s|/system/product/framework/|/system/system_ext/framework/|g" "${2}"
+ ;;
+
+ system_ext/etc/permissions/qcrilhook.xml)
+ sed -i "s|/product/framework/qcrilhook.jar|/system_ext/framework/qcrilhook.jar|g" "${2}"
+ ;;
+
+ system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml | system_ext/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml)
+ sed -i 's/xml version="2.0"/xml version="1.0"/' "${2}"
+ sed -i "s|product|system_ext|g" "${2}"
+ ;;
vendor/bin/mlipayd@1.1)
"$PATCHELF" --remove-needed vendor.xiaomi.hardware.mtdservice@1.0.so "${2}"
@@ -97,9 +118,6 @@ function blob_fixup() {
vendor/lib64/libwvhidl.so)
"$PATCHELF" --replace-needed "libprotobuf-cpp-lite.so" "libprotobuf-cpp-lite-v29.so" "${2}"
- ;;
- product/etc/permissions/vendor.qti.hardware.data.connection-V1.{0,1}-java.xml)
- sed -i 's/xml version="2.0"/xml version="1.0"/' "${2}"
esac
}
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e69a493c..f1e4be25 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -76,9 +76,9 @@ vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so|fbf078c47a2a67be329e8390c9
vendor/lib64/vendor.qti.hardware.alarm@1.0.so|526b7c9ade9787565d48fcafae6230f04effa8d6
# ANT+ - from LA.UM.8.2.r1-07400-sdm660.0
--lib/libantradio.so|523f108cabe6c0a2a52fa4476ada8b65eacdd9a9
--lib64/libantradio.so|7b4e5ed251fa9e33960b58495f60de55c6739767
-product/lib64/com.qualcomm.qti.ant@1.0.so|d374b4deb0df088dfc6151c37385a9b125bf3427
+-lib/libantradio.so:system_ext/lib/libantradio.so|523f108cabe6c0a2a52fa4476ada8b65eacdd9a9
+-lib64/libantradio.so:system_ext/lib64/libantradio.so|7b4e5ed251fa9e33960b58495f60de55c6739767
+product/lib64/com.qualcomm.qti.ant@1.0.so:system_ext/lib64/com.qualcomm.qti.ant@1.0.so|d374b4deb0df088dfc6151c37385a9b125bf3427
vendor/lib64/com.qualcomm.qti.ant@1.0.so|9dc1bc2f1d726d71af31cc8c955aba122bbcdb1e
vendor/lib64/hw/com.qualcomm.qti.ant@1.0-impl.so|203528c568c1c5ce33b35dcb9ee9eb7ecb1de206
@@ -134,8 +134,8 @@ vendor/lib64/libsysmon_cdsp_skel.so|40d3511922c744016c419983b18f97952c23fee5
vendor/bin/hvdcp_opti|2ec1df65507776891f729cf1784579dc703d05cb
# CNE - from LA.UM.8.2.r1-07400-sdm660.0
--product/framework/vendor.qti.data.factory-V2.1-java.jar|3f8d28716003c02d9720c8c83a6d108a82359eae
--product/framework/vendor.qti.hardware.data.latency-V1.0-java.jar|c6c5d5bbf50b068df0184aef8551b95daa5f4791
+-product/framework/vendor.qti.data.factory-V2.1-java.jar:system_ext/framework/vendor.qti.data.factory-V2.1-java.jar|3f8d28716003c02d9720c8c83a6d108a82359eae
+-product/framework/vendor.qti.hardware.data.latency-V1.0-java.jar:system_ext/framework/vendor.qti.hardware.data.latency-V1.0-java.jar|c6c5d5bbf50b068df0184aef8551b95daa5f4791
-vendor/app/CneApp/CneApp.apk|cbae7c76333b044fdcba624015f32596848ef9f0
-vendor/app/IWlanService/IWlanService.apk|32cb03f65a3412c7e0390b445ce5f36bcedfb809
product/lib/vendor.qti.data.factory@2.1.so|ae2986e8c7fec0434b0c036a1b790df34fb8b679
@@ -210,19 +210,19 @@ vendor/lib/vendor.qti.hardware.qdutils_disp@1.0.so|6d82db4f225b2256f803b30d18117
vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so|841104a6d894f2afb733bb2317b70092298a8537
# DPM - from LA.UM.8.2.r1-07400-sdm660.0
--product/priv-app/dpmserviceapp/dpmserviceapp.apk|68b6f0227ae0b065dff635f30bfdc3c23f90c395
-product/bin/dpmd|6c511e3e4293705777b563b45d7c216207a6ead0
-product/etc/dpm/dpm.conf|95e27da8c989e96c6faea6f0697bce11955b62a5
-product/etc/init/dpmd.rc|7f95195a89fddce06b93006a737701270e91f669
-product/etc/permissions/com.qti.dpmframework.xml|f57aa37de402a2c239fdadb65ac044d364ec1114
-product/etc/permissions/dpmapi.xml|0991b3069308620cfcad53873e9f09af181b981d
-product/framework/com.qti.dpmframework.jar|e2cd9acebce2e507b14185e0f35a98b94a063072
-product/framework/dpmapi.jar|4696df9793ad676b305d53b5d7ce65ecf74771ad
-product/lib64/com.qualcomm.qti.dpm.api@1.0.so|a70cfc1be3e06cde6318d6969e114429fe1950bb
-product/lib64/libdpmctmgr.so|597790027ff767d64e89c4a83cdafc18ce4179d5
-product/lib64/libdpmfdmgr.so|eb882f1e5983e18eda9718a1451019cecbead5a6
-product/lib64/libdpmframework.so|2e8728c506402b5b546b7ab72440cacd019c433a
-product/lib64/libdpmtcm.so|b53544d539e1196717cac122402139c8bf341af1
+-product/priv-app/dpmserviceapp/dpmserviceapp.apk:system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk|68b6f0227ae0b065dff635f30bfdc3c23f90c395
+product/bin/dpmd:system_ext/bin/dpmd|6c511e3e4293705777b563b45d7c216207a6ead0
+product/etc/dpm/dpm.conf:system_ext/etc/dpm/dpm.conf|95e27da8c989e96c6faea6f0697bce11955b62a5
+product/etc/init/dpmd.rc:system_ext/etc/init/dpmd.rc|a07af37e4ec307762b687d07fb8ed1c9c26a6712
+product/etc/permissions/com.qti.dpmframework.xml:system_ext/etc/permissions/com.qti.dpmframework.xml|c98e86f374d8c5bb7fa59f652ad94d1db4b0eda1
+product/etc/permissions/dpmapi.xml:system_ext/etc/permissions/dpmapi.xml|491780c6ffe82c3428f2e9e62bfec395df96bfc1
+product/framework/com.qti.dpmframework.jar:system_ext/framework/com.qti.dpmframework.jar|e2cd9acebce2e507b14185e0f35a98b94a063072
+product/framework/dpmapi.jar:system_ext/framework/dpmapi.jar|4696df9793ad676b305d53b5d7ce65ecf74771ad
+product/lib64/com.qualcomm.qti.dpm.api@1.0.so:system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so|a70cfc1be3e06cde6318d6969e114429fe1950bb
+product/lib64/libdpmctmgr.so:system_ext/lib64/libdpmctmgr.so|597790027ff767d64e89c4a83cdafc18ce4179d5
+product/lib64/libdpmfdmgr.so:system_ext/lib64/libdpmfdmgr.so|eb882f1e5983e18eda9718a1451019cecbead5a6
+product/lib64/libdpmframework.so:system_ext/lib64/libdpmframework.so|2e8728c506402b5b546b7ab72440cacd019c433a
+product/lib64/libdpmtcm.so:system_ext/lib64/libdpmtcm.so|b53544d539e1196717cac122402139c8bf341af1
vendor/bin/dpmQmiMgr|97b96d38bd463da36c57ae5161b3ce9728b63b45
vendor/etc/init/dpmQmiMgr.rc|67569302d3a8828a9118c835e5b69c51b0c8ac68
vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so|ab5d46cbf14ce90ab44aaab4dc1520378c568033
@@ -277,12 +277,12 @@ vendor/lib/hw/vendor.qti.esepowermanager@1.0-impl.so|c03d9380b60a794ababac1c6ec2
vendor/lib64/hw/vendor.qti.esepowermanager@1.0-impl.so|34206c519a4ccd08545921d68db74b22ab3a0a93
# FM - from LA.UM.8.2.r1-07400-sdm660.0
--product/lib/vendor.qti.hardware.fm@1.0.so|f50e4e86fcebf256540398deebab281bc8ff0a57
--product/lib64/vendor.qti.hardware.fm@1.0.so|c190ec6ecb995b556c30a214a8a7cf4894e72e5f
-lib/fm_helium.so|8abd638bedf7e9d36b168634198fc765c0d7a27b
-lib/libfm-hci.so|3cc2262f0d0c7178e16c96367ce338893b7b9124
-lib64/fm_helium.so|eb2396d938327e586ecdf8842efbc71d58f1bf05
-lib64/libfm-hci.so|c90fd242d6b31cebb5425cc69ae75261e77ed227
+-product/lib/vendor.qti.hardware.fm@1.0.so:system_ext/lib/vendor.qti.hardware.fm@1.0.so|f50e4e86fcebf256540398deebab281bc8ff0a57
+-product/lib64/vendor.qti.hardware.fm@1.0.so:system_ext/lib64/vendor.qti.hardware.fm@1.0.so|c190ec6ecb995b556c30a214a8a7cf4894e72e5f
+lib/fm_helium.so:system_ext/lib/fm_helium.so|8abd638bedf7e9d36b168634198fc765c0d7a27b
+lib/libfm-hci.so:system_ext/lib/libfm-hci.so|3cc2262f0d0c7178e16c96367ce338893b7b9124
+lib64/fm_helium.so:system_ext/lib64/fm_helium.so|eb2396d938327e586ecdf8842efbc71d58f1bf05
+lib64/libfm-hci.so:system_ext/lib64/libfm-hci.so|c90fd242d6b31cebb5425cc69ae75261e77ed227
vendor/bin/fm_qsoc_patches|eb6c841aee0f9ad6b8f1b9452963d1d81c669b38
vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so|49bd05045b461e4a91926d6d1b39e9b80399a7b9
vendor/lib/vendor.qti.hardware.fm@1.0.so|299b889186af05d99f1c8a2e2828c427484e1752
@@ -519,16 +519,17 @@ vendor/lib64/libqrtr.so|c7ca700c1f4759aa673a6c5478ca492487bbea70
vendor/lib64/libqsocket.so|40816476d857f2ad07490415f6ff7433517ccef8
# Radio - from LA.UM.8.2.r1-07400-sdm660.0
--product/app/QtiTelephonyService/QtiTelephonyService.apk|9758fbbaa7b2a18c01a32200b3a86a4dbc798d3c
--product/app/datastatusnotification/datastatusnotification.apk|4685df4bb2446950bcb37da83f4acefc69bfcdc3
--product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk|71d083671c3ea4cd5e287a63fb254bb0ab60ed20
--product/framework/QtiTelephonyServicelibrary.jar|ea30b05eaad3ebee157421b3f31bf8585566b4cd
--product/framework/qcrilhook.jar|5138c90b44466794167df88d4060545c93832ba8
-product/etc/permissions/qcrilhook.xml|ceb890ab3c1645aa0d0044abab1ba58c4097a991
+-product/app/QtiTelephonyService/QtiTelephonyService.apk:system_ext/app/QtiTelephonyService/QtiTelephonyService.apk|9758fbbaa7b2a18c01a32200b3a86a4dbc798d3c
+-product/app/datastatusnotification/datastatusnotification.apk:system_ext/app/datastatusnotification/datastatusnotification.apk|4685df4bb2446950bcb37da83f4acefc69bfcdc3
+-product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk:system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk|71d083671c3ea4cd5e287a63fb254bb0ab60ed20
+-product/framework/QtiTelephonyServicelibrary.jar:system_ext/framework/QtiTelephonyServicelibrary.jar|ea30b05eaad3ebee157421b3f31bf8585566b4cd
+-product/framework/qcrilhook.jar:system_ext/framework/qcrilhook.jar|5138c90b44466794167df88d4060545c93832ba8
+product/etc/permissions/qcrilhook.xml:system_ext/etc/permissions/qcrilhook.xml|30397e293b2c40e6b7a1d11c2a615cdd05de625a
product/etc/permissions/telephony_product_privapp-permissions-qti.xml|68901007ba1a48ceb1b728fc3b5483dd51b5e3a0
-product/etc/permissions/telephonyservice.xml|a39eefcaf85fb8da60044fdbbcfddd95deb031c8
-product/lib/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so|2f47d86ad62c2d697a598147001842df16012a49
-product/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so|f4677032e503f314738e366674dacc1b35fc8a1d
+product/etc/permissions/telephonyservice.xml:system_ext/etc/permissions/telephonyservice.xml|44706b42a9a766a9d85ccdeec9cec762ee00da7a
+product/lib/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so:system_ext/lib/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so|2f47d86ad62c2d697a598147001842df16012a49
+product/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so:system_ext/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so|f4677032e503f314738e366674dacc1b35fc8a1d
+system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml|76fc5edbdc10f89e83ecfab6653e054773e7cc3f
vendor/bin/ATFWD-daemon|540d63133a5edb0e4e39fd0ec6bcf34939f58ca6
vendor/bin/adpl|fd72fbd0c4e3019996deb9751e507d2e1b5208f9
vendor/bin/hw/qcrild|e6388657a78502c6211ff7dd54d1edbc7e97f148
@@ -623,46 +624,46 @@ vendor/radio/qcril_database/upgrade/5_version_update_ecc_table.sql|fcb2cba3bfd71
system_ext/framework/qti-telephony-common.jar|6ef78677c097072dbf44eb8fcc938391053ead3b
# Radio (IMS) - from LA.UM.8.2.r1-07400-sdm660.0
--product/app/imssettings/imssettings.apk|a23e16675f06780fd98c6c88aba8b29a612d94e4
--product/app/uceShimService/uceShimService.apk|e496f42d32a476fef2e45e48d94135eca6bd007f
--product/priv-app/ims/ims.apk|034a1de5ac56dbfd524d341b9e1ecb72641474f7
--product/framework/vendor.qti.ims.callcapability-V1.0-java.jar|fab3b3ee2aef50a8836657639c5a7478fa407474
--product/framework/vendor.qti.ims.factory-V1.0-java.jar|0a5118c5e36f4cd15154ee69918a5c58559df171
--product/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar|ffd8d94c2b41fef4e422f7247ee164d7ed70ff5d
--product/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar|836ef6801f0a09cde1bbef7af8b282365198fac4
--product/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar|fde4900c414b5666c09ca2e792a0b7ac1be3a808
--product/framework/com.qualcomm.qti.uceservice-V2.0-java.jar|2f4d6d2681e1adfc249eb6f88858710b12053448
--product/framework/com.qualcomm.qti.uceservice-V2.1-java.jar|f9dadb1b224d100ecc0a8785bde463d9d1bc7a45
--product/framework/vendor.qti.ims.callinfo-V1.0-java.jar|a01874e994d2674d538f86de39e9ccbf6ef3fc8c
--product/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar|f2a2e5554ad6ae1363a9aa76c6d0e6732bbdc7fb
--product/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar|1c44a0a14003d8c81f425317a11353733c9ca243
-etc/permissions/com.qualcomm.qti.imscmservice.xml|db25ef24f1937366d58a53b4f4b8923bc9e98d2d
-product/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml|aeaf8d4c7d421bd25a1aca1736980b6e4575c7ce
-product/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml|d52cdba3a8f1c00098568965c0cbaa03502f961e
-product/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml|bc80cc63f55de0d80e9756dd4a9d0afc36072c61
-product/lib/libdiag_system.so|a26522c2f65ca7cf9580da34c267490ce75f439c
-product/lib/vendor.qti.ims.callcapability@1.0.so|c8e7cd91e7575f3ba6a2dc86680fe82e198447cd
-product/lib/vendor.qti.ims.callinfo@1.0.so|6152cc83fff0a0e39085222615fcd6eb09b9dec5
-product/lib/vendor.qti.ims.factory@1.0.so|c9b293011d513c3203e9dcea143da6374ccf4683
-product/lib/vendor.qti.ims.rcsconfig@1.0.so|3a6f266c9ca1a66eab40ce696f728e7e77a1a04f
-product/lib/vendor.qti.ims.rcsconfig@1.1.so|8f949fd05eead167a0181d5ad92260bc15e8cd75
-product/lib/vendor.qti.imsrtpservice@2.0.so|da4060a64179772801942946e71a655e76936157
-product/lib/vendor.qti.imsrtpservice@2.1.so|5074623f761ef54a6378ba09cbea31c60a9363fd
-product/lib64/lib-imscamera.so|6a7a65b3aa011207990eb2c71d1e7e2b79827006
-product/lib64/lib-imsvideocodec.so|d0b9170dd6ee6336c1a7c1311efb326a58d52e61
-product/lib64/lib-imsvt.so|e5497d2a4a47de3b2948070999a8bd8394fcb1b6
-product/lib64/lib-imsvtextutils.so|2a56339597b28fb649732db1efc5ba9c05b85c5e
-product/lib64/lib-imsvtutils.so|645d7ed0c35fcbb711d240d60dcc549340b94132
-product/lib64/libdiag_system.so|eb037614035fd07d6dc38cd8b0249aa247ceabcf
-product/lib64/libimscamera_jni.so|41fd9faa10818c9f7c5a14d372a07f79b0ca0daa
-product/lib64/libimsmedia_jni.so|86ff68440540c40834c2e17261f178f7de50549e
-product/lib64/vendor.qti.ims.callcapability@1.0.so|9e8a163154bf85aa53d6e781b4c0fab84d5da43b
-product/lib64/vendor.qti.ims.callinfo@1.0.so|bf2a4a99c4ac33e3453e196e9961568b175f5b1e
-product/lib64/vendor.qti.ims.factory@1.0.so|5b3f09cd943cfc397532f8e25174cd71074e6d5a
-product/lib64/vendor.qti.ims.rcsconfig@1.0.so|3c009fdc33fe7ccfef9025c2911cec0ba9242516
-product/lib64/vendor.qti.ims.rcsconfig@1.1.so|e0f2ac53139a23c4d85e0bf9be7b3ce699967096
-product/lib64/vendor.qti.imsrtpservice@2.0.so|6ef5cd72d34c20e82cb0e58681a4aae9b0dac99a
-product/lib64/vendor.qti.imsrtpservice@2.1.so|6dbe703a5a8389c342008c950aaec7a3a260a055
+-product/app/imssettings/imssettings.apk:system_ext/app/imssettings/imssettings.apk|a23e16675f06780fd98c6c88aba8b29a612d94e4
+-product/app/uceShimService/uceShimService.apk:system_ext/app/uceShimService/uceShimService.apk|e496f42d32a476fef2e45e48d94135eca6bd007f
+-product/priv-app/ims/ims.apk:system_ext/priv-app/ims/ims.apk|034a1de5ac56dbfd524d341b9e1ecb72641474f7
+-product/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar|ffd8d94c2b41fef4e422f7247ee164d7ed70ff5d
+-product/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar|836ef6801f0a09cde1bbef7af8b282365198fac4
+-product/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar:system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar|fde4900c414b5666c09ca2e792a0b7ac1be3a808
+-product/framework/com.qualcomm.qti.uceservice-V2.0-java.jar:system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar|2f4d6d2681e1adfc249eb6f88858710b12053448
+-product/framework/com.qualcomm.qti.uceservice-V2.1-java.jar:system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar|f9dadb1b224d100ecc0a8785bde463d9d1bc7a45
+-product/framework/vendor.qti.ims.callcapability-V1.0-java.jar:system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar|fab3b3ee2aef50a8836657639c5a7478fa407474
+-product/framework/vendor.qti.ims.factory-V1.0-java.jar:system_ext/framework/vendor.qti.ims.factory-V1.0-java.jar|0a5118c5e36f4cd15154ee69918a5c58559df171
+-product/framework/vendor.qti.ims.callinfo-V1.0-java.jar:system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar|a01874e994d2674d538f86de39e9ccbf6ef3fc8c
+-product/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar:system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar|f2a2e5554ad6ae1363a9aa76c6d0e6732bbdc7fb
+-product/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar:system_ext/framework/vendor.qti.ims.rcsconfig-V1.1-java.jar|1c44a0a14003d8c81f425317a11353733c9ca243
+etc/permissions/com.qualcomm.qti.imscmservice.xml:system_ext/etc/permissions/com.qualcomm.qti.imscmservice.xml|15d0911f93adc924643a2f148d94f3668dbb5f5f
+product/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml:system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml|bd9fc166b542b4e730f194ebc996957770d9d497
+product/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml:system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml|4153f38c3bdb8caff16cc1f02f7a034d8694e02a
+product/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml:system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml|aa8bcf2b7de01dc76bc4ae98a7d893f8b4fa33a0
+product/lib/libdiag_system.so:system_ext/lib/libdiag_system.so|a26522c2f65ca7cf9580da34c267490ce75f439c
+product/lib/vendor.qti.ims.callcapability@1.0.so:system_ext/lib/vendor.qti.ims.callcapability@1.0.so|c8e7cd91e7575f3ba6a2dc86680fe82e198447cd
+product/lib/vendor.qti.ims.callinfo@1.0.so:system_ext/lib/vendor.qti.ims.callinfo@1.0.so|6152cc83fff0a0e39085222615fcd6eb09b9dec5
+product/lib/vendor.qti.ims.factory@1.0.so:system_ext/lib/vendor.qti.ims.factory@1.0.so|c9b293011d513c3203e9dcea143da6374ccf4683
+product/lib/vendor.qti.ims.rcsconfig@1.0.so:system_ext/lib/vendor.qti.ims.rcsconfig@1.0.so|3a6f266c9ca1a66eab40ce696f728e7e77a1a04f
+product/lib/vendor.qti.ims.rcsconfig@1.1.so:system_ext/lib/vendor.qti.ims.rcsconfig@1.1.so|8f949fd05eead167a0181d5ad92260bc15e8cd75
+product/lib/vendor.qti.imsrtpservice@2.0.so:system_ext/lib/vendor.qti.imsrtpservice@2.0.so|da4060a64179772801942946e71a655e76936157
+product/lib/vendor.qti.imsrtpservice@2.1.so:system_ext/lib/vendor.qti.imsrtpservice@2.1.so|5074623f761ef54a6378ba09cbea31c60a9363fd
+product/lib64/lib-imscamera.so:system_ext/lib64/lib-imscamera.so|6a7a65b3aa011207990eb2c71d1e7e2b79827006
+product/lib64/lib-imsvideocodec.so:system_ext/lib64/lib-imsvideocodec.so|d0b9170dd6ee6336c1a7c1311efb326a58d52e61
+product/lib64/lib-imsvt.so:system_ext/lib64/lib-imsvt.so|e5497d2a4a47de3b2948070999a8bd8394fcb1b6
+product/lib64/lib-imsvtextutils.so:system_ext/lib64/lib-imsvtextutils.so|2a56339597b28fb649732db1efc5ba9c05b85c5e
+product/lib64/lib-imsvtutils.so:system_ext/lib64/lib-imsvtutils.so|645d7ed0c35fcbb711d240d60dcc549340b94132
+product/lib64/libdiag_system.so:system_ext/lib64/libdiag_system.so|eb037614035fd07d6dc38cd8b0249aa247ceabcf
+product/lib64/libimscamera_jni.so:system_ext/lib64/libimscamera_jni.so|41fd9faa10818c9f7c5a14d372a07f79b0ca0daa
+product/lib64/libimsmedia_jni.so:system_ext/lib64/libimsmedia_jni.so|86ff68440540c40834c2e17261f178f7de50549e
+product/lib64/vendor.qti.ims.callcapability@1.0.so:system_ext/lib64/vendor.qti.ims.callcapability@1.0.so|9e8a163154bf85aa53d6e781b4c0fab84d5da43b
+product/lib64/vendor.qti.ims.callinfo@1.0.so:system_ext/lib64/vendor.qti.ims.callinfo@1.0.so|bf2a4a99c4ac33e3453e196e9961568b175f5b1e
+product/lib64/vendor.qti.ims.factory@1.0.so:system_ext/lib64/vendor.qti.ims.factory@1.0.so|5b3f09cd943cfc397532f8e25174cd71074e6d5a
+product/lib64/vendor.qti.ims.rcsconfig@1.0.so:system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so|3c009fdc33fe7ccfef9025c2911cec0ba9242516
+product/lib64/vendor.qti.ims.rcsconfig@1.1.so:system_ext/lib64/vendor.qti.ims.rcsconfig@1.1.so|e0f2ac53139a23c4d85e0bf9be7b3ce699967096
+product/lib64/vendor.qti.imsrtpservice@2.0.so:system_ext/lib64/vendor.qti.imsrtpservice@2.0.so|6ef5cd72d34c20e82cb0e58681a4aae9b0dac99a
+product/lib64/vendor.qti.imsrtpservice@2.1.so:system_ext/lib64/vendor.qti.imsrtpservice@2.1.so|6dbe703a5a8389c342008c950aaec7a3a260a055
vendor/bin/ims_rtp_daemon|d250a2d8e8202a7daeca932f56579d2ccb21079c
vendor/bin/imsdatadaemon|172f0b5d4a119092dd3d80835031bd851414198f
vendor/bin/imsqmidaemon|10fe6c8fc9f38ffbc704bea135dcf67423135463
diff --git a/sdm660.mk b/sdm660.mk
index d092c16b..42501938 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -470,7 +470,7 @@ PRODUCT_PACKAGES += \
# Privapp-Permissions
PRODUCT_COPY_FILES += \
- $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-qti.xml \
+ $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system-ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-qti.xml \
$(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
$(COMMON_PATH)/configs/privapp-permission/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml