sdm660-common: drop, update & revert some blobs

X00TD/Android.bp

@@ -5,3 +5,10 @@
 soong_namespace {
 }
 
+dex_import {
+	name: "vendor.qti.hardware.fingerprint-V1.0-java",
+	owner: "asus",
+	jars: ["proprietary/product/framework/vendor.qti.hardware.fingerprint-V1.0-java.jar"],
+	product_specific: true,
+}
+

X00TD/X00TD-vendor.mk

@@ -6,7 +6,6 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/asus/X00TD
 
 PRODUCT_COPY_FILES += \
-    vendor/asus/X00TD/proprietary/product/framework/vendor.qti.hardware.fingerprint-V1.0-java.jar:$(TARGET_COPY_OUT_PRODUCT)/framework/vendor.qti.hardware.fingerprint-V1.0-java.jar \
     vendor/asus/X00TD/proprietary/vendor/bin/qfp-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/qfp-daemon \
     vendor/asus/X00TD/proprietary/vendor/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb \
     vendor/asus/X00TD/proprietary/vendor/etc/acdbdata/MTP/MTP_General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/MTP/MTP_General_cal.acdb \
@@ -652,3 +651,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/X00TD/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0-service.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvendor.goodix.hardware.fingerprint@1.0-service.so \
     vendor/asus/X00TD/proprietary/vendor/lib64/libvendor.goodix.hardware.fingerprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libvendor.goodix.hardware.fingerprint@1.0.so \
     vendor/asus/X00TD/proprietary/vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fingerprint@1.0.so
+
+PRODUCT_PACKAGES += \
+    vendor.qti.hardware.fingerprint-V1.0-java

X00TD/proprietary/vendor/etc/calmodule.cfg

@@ -1,3 +0,0 @@
-libcalmodule_common.so
-libcalmodule_gyroscope.so
-libcalmodule_qti_algo.so

X00TD/proprietary/vendor/etc/sensors/sensor_def_qcomdev.conf

@@ -5810,49 +5810,49 @@
 # SSC GPIO CFG (Unused)
 #-----------------------------
 #
-6300       1 0x00010001 # version
+#6300       1 0x00010001 # version
-6301  0x0104 0x00010001 # gpio num
+#6301  0x0104 0x00010001 # gpio num
-6302       2 0x00010001 # active func sel
+#6302       2 0x00010001 # active func sel
-6303       1 0x00010001 # active dir
+#6303       1 0x00010001 # active dir
-6304       0 0x00010001 # active pull
+#6304       0 0x00010001 # active pull
-6305       3 0x00010001 # active drive
+#6305       3 0x00010001 # active drive
-6306       2 0x00010001 # inactive func sel
+#6306       2 0x00010001 # inactive func sel
-6307       0 0x00010001 # inactive dir
+#6307       0 0x00010001 # inactive dir
-6308       2 0x00010001 # inactive pull
+#6308       2 0x00010001 # inactive pull
-6309       3 0x00010001 # inactive drive
+#6309       3 0x00010001 # inactive drive
 
-6310       1 0x00010001 # version
+#6310       1 0x00010001 # version
-6311  0x0105 0x00010001 # gpio num
+#6311  0x0105 0x00010001 # gpio num
-6312       2 0x00010001 # active func sel
+#6312       2 0x00010001 # active func sel
-6313       1 0x00010001 # active dir
+#6313       1 0x00010001 # active dir
-6314       0 0x00010001 # active pull
+#6314       0 0x00010001 # active pull
-6315       3 0x00010001 # active drive
+#6315       3 0x00010001 # active drive
-6316       2 0x00010001 # inactive func sel
+#6316       2 0x00010001 # inactive func sel
-6317       0 0x00010001 # inactive dir
+#6317       0 0x00010001 # inactive dir
-6318       2 0x00010001 # inactive pull
+#6318       2 0x00010001 # inactive pull
-6319       3 0x00010001 # inactive drive
+#6319       3 0x00010001 # inactive drive
 
-6320       1 0x00010001 # version
+#6320       1 0x00010001 # version
-6321  0x0106 0x00010001 # gpio num
+#6321  0x0106 0x00010001 # gpio num
-6322       2 0x00010001 # active func sel
+#6322       2 0x00010001 # active func sel
-6323       1 0x00010001 # active dir
+#6323       1 0x00010001 # active dir
-6324       0 0x00010001 # active pull
+#6324       0 0x00010001 # active pull
-6325       3 0x00010001 # active drive
+#6325       3 0x00010001 # active drive
-6326       2 0x00010001 # inactive func sel
+#6326       2 0x00010001 # inactive func sel
-6327       0 0x00010001 # inactive dir
+#6327       0 0x00010001 # inactive dir
-6328       2 0x00010001 # inactive pull
+#6328       2 0x00010001 # inactive pull
-6329       3 0x00010001 # inactive drive
+#6329       3 0x00010001 # inactive drive
 
-6330       1 0x00010001 # version
+#6330       1 0x00010001 # version
-6331  0x0107 0x00010001 # gpio num
+#6331  0x0107 0x00010001 # gpio num
-6332       2 0x00010001 # active func sel
+#6332       2 0x00010001 # active func sel
-6333       0 0x00010001 # active dir
+#6333       0 0x00010001 # active dir
-6334       0 0x00010001 # active pull
+#6334       0 0x00010001 # active pull
-6335       3 0x00010001 # active drive
+#6335       3 0x00010001 # active drive
-6336       2 0x00010001 # inactive func sel
+#6336       2 0x00010001 # inactive func sel
-6337       0 0x00010001 # inactive dir
+#6337       0 0x00010001 # inactive dir
-6338       2 0x00010001 # inactive pull
+#6338       2 0x00010001 # inactive pull
-6339       3 0x00010001 # inactive drive
+#6339       3 0x00010001 # inactive drive
 
 6340       1 0x00010001 # version
 6341  0x010C 0x00010001 # gpio num

sdm660-common/Android.bp

@@ -59,7 +59,6 @@ android_app_import {
 	name: "CneApp",
 	owner: "asus",
 	apk: "proprietary/vendor/app/CneApp/CneApp.apk",
-	required: ["CneApp.libvndfwk_detect_jni.qti_symlink"],
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -90,20 +89,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "uimremoteclient",
+	name: "DeviceStatisticsService",
 	owner: "asus",
-	apk: "proprietary/product/app/uimremoteclient/uimremoteclient.apk",
+	apk: "proprietary/system_ext/app/DeviceStatisticsService/DeviceStatisticsService.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "MotoSignatureApp",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/MotoSignatureApp/MotoSignatureApp.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -112,64 +100,31 @@ android_app_import {
 }
 
 android_app_import {
-	name: "uimremoteserver",
+	name: "QtiTelephonyService",
 	owner: "asus",
-	apk: "proprietary/product/app/uimremoteserver/uimremoteserver.apk",
+	apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "remoteSimLockAuthentication",
 	owner: "asus",
-	apk: "proprietary/product/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk",
+	apk: "proprietary/system_ext/app/remoteSimLockAuthentication/remoteSimLockAuthentication.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	product_specific: true,
+	system_ext_specific: true,
 }
 
 android_app_import {
 	name: "remotesimlockservice",
 	owner: "asus",
-	apk: "proprietary/product/app/remotesimlockservice/remotesimlockservice.apk",
+	apk: "proprietary/system_ext/app/remotesimlockservice/remotesimlockservice.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "uimlpaservice",
-	owner: "asus",
-	apk: "proprietary/product/app/uimlpaservice/uimlpaservice.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "xdivert",
-	owner: "asus",
-	apk: "proprietary/product/app/xdivert/xdivert.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "QtiTelephonyService",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -189,46 +144,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "MotoDolbyDax3",
+	name: "uimgbaservice",
 	owner: "asus",
-	apk: "proprietary/system_ext/priv-app/MotoDolbyDax3/MotoDolbyDax3.apk",
+	apk: "proprietary/system_ext/app/uimgbaservice/uimgbaservice.apk",
-	overrides: ["MusicFX"],
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "MotorolaSettingsProvider",
-	owner: "asus",
-	apk: "proprietary/system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "daxService",
-	owner: "asus",
-	apk: "proprietary/system_ext/priv-app/daxService/daxService.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "DynamicDDSService",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -237,9 +155,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "ImsDataChannelService",
+	name: "uimlpaservice",
 	owner: "asus",
-	apk: "proprietary/system_ext/app/ImsDataChannelService/ImsDataChannelService.apk",
+	apk: "proprietary/system_ext/app/uimlpaservice/uimlpaservice.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -248,9 +166,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "ImsRcsService",
+	name: "uimremoteclient",
 	owner: "asus",
-	apk: "proprietary/system_ext/app/ImsRcsService/ImsRcsService.apk",
+	apk: "proprietary/system_ext/app/uimremoteclient/uimremoteclient.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -259,27 +177,25 @@ android_app_import {
 }
 
 android_app_import {
-	name: "HotwordEnrollmentOKGoogleHEXAGON",
+	name: "uimremoteserver",
 	owner: "asus",
-	apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk",
+	apk: "proprietary/system_ext/app/uimremoteserver/uimremoteserver.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
+	system_ext_specific: true,
-	product_specific: true,
 }
 
 android_app_import {
-	name: "HotwordEnrollmentXGoogleHEXAGON",
+	name: "xdivert",
 	owner: "asus",
-	apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk",
+	apk: "proprietary/system_ext/app/xdivert/xdivert.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
 	},
-	privileged: true,
+	system_ext_specific: true,
-	product_specific: true,
 }
 
 android_app_import {
@@ -312,76 +228,6 @@ dex_import {
 	jars: ["proprietary/system/framework/tcmclient.jar"],
 }
 
-dex_import {
-	name: "remotesimlockmanagerlibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/remotesimlockmanagerlibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimgbalibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimgbalibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimgbamanagerlibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimgbamanagerlibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "com.motorola.frameworks.core.addon",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/com.motorola.frameworks.core.addon.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "com.motorola.motosignature",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/com.motorola.motosignature.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "uimlpalibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimlpalibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimremoteclientlibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimremoteclientlibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimremoteserverlibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimremoteserverlibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimremotesimlocklibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimremotesimlocklibrary.jar"],
-	product_specific: true,
-}
-
-dex_import {
-	name: "uimservicelibrary",
-	owner: "asus",
-	jars: ["proprietary/product/framework/uimservicelibrary.jar"],
-	product_specific: true,
-}
-
 dex_import {
 	name: "ActivityExt",
 	owner: "asus",
@@ -494,34 +340,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "datachannellib",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/datachannellib.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "moto-checkin",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/moto-checkin.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "moto-settings",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/moto-settings.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "moto",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/moto.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "qcrilhook",
 	owner: "asus",
@@ -536,6 +354,62 @@ dex_import {
 	system_ext_specific: true,
 }
 
+dex_import {
+	name: "remotesimlockmanagerlibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/remotesimlockmanagerlibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimgbalibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimgbalibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimgbamanagerlibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimgbamanagerlibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimlpalibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimlpalibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimremoteclientlibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimremoteclientlibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimremoteserverlibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimremoteserverlibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimremotesimlocklibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimremotesimlocklibrary.jar"],
+	system_ext_specific: true,
+}
+
+dex_import {
+	name: "uimservicelibrary",
+	owner: "asus",
+	jars: ["proprietary/system_ext/framework/uimservicelibrary.jar"],
+	system_ext_specific: true,
+}
+
 dex_import {
 	name: "vendor.qti.data.factory-V1.0-java",
 	owner: "asus",
@@ -571,20 +445,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.data.factory-V2.4-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.4-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.data.factory-V2.5-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.data.factory-V2.5-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.data.mwqem-V1.0-java",
 	owner: "asus",
@@ -620,20 +480,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.hardware.data.cne.internal.server-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.hardware.data.cne.internal.server-V1.2-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.2-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.hardware.data.connection-V1.0-java",
 	owner: "asus",
@@ -655,27 +501,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.hardware.data.dynamicdds-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.hardware.data.flow-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.hardware.data.flow-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.flow-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.hardware.data.iwlan-V1.0-java",
 	owner: "asus",
@@ -683,13 +508,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.hardware.data.iwlan-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.hardware.data.iwlan-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.hardware.data.latency-V1.0-java",
 	owner: "asus",
@@ -753,27 +571,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.ims.factory-V2.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.factory-V2.1-java",
-	owner: "asus",
-	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: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.ims.rcsconfig-V1.0-java",
 	owner: "asus",
@@ -802,76 +599,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.ims.configservice-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.configservice-V1.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.configservice-V1.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.connection-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.datachannelservice-V1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.datachannelservice-V1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcssip-V1.0-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcssip-V1.1-java",
-	owner: "asus",
-	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: "asus",
-	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: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.ims.rcsuce-V1.1-java",
-	owner: "asus",
-	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: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "vendor.qti.latency-V2.0-java",
 	owner: "asus",
@@ -879,20 +606,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.latency-V2.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar"],
-	system_ext_specific: true,
-}
-
-dex_import {
-	name: "vendor.qti.latency-V2.2-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.latency-V2.2-java.jar"],
-	system_ext_specific: true,
-}
-
 prebuilt_etc_xml {
 	name: "manifest_android.hardware.drm@1.3-service.widevine",
 	owner: "asus",

sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2018-2019 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
-    <library name="vendor.qti.hardware.data.connection-V1.0-java"
-            file="/system/system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar" />
-</permissions>

sdm660-common/proprietary/product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2019 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
-    <library name="vendor.qti.hardware.data.connection-V1.1-java"
-            file="/system/system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar" />
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlock.xml

@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.qti.remoteSimlock.uimremotesimlocklibrary"
-          file="/product/framework/uimremotesimlocklibrary.jar"/>
+          file="/system_ext/framework/uimremotesimlocklibrary.jar"/>
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/RemoteSimlockManager.xml

@@ -7,6 +7,6 @@
 
 <permissions>
  <library name="com.qualcomm.qti.remoteSimlock.manager.remotesimlockmanagerlibrary"
-          file="/product/framework/remotesimlockmanagerlibrary.jar"
+          file="/system_ext/framework/remotesimlockmanagerlibrary.jar"
           dependency="com.qualcomm.qti.remoteSimlock.uimremotesimlocklibrary"/>
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/UimGba.xml

@@ -6,5 +6,5 @@
 -->
 <permissions>
  <library name="com.qualcomm.qti.uimGba.uimgbalibrary"
-          file="/product/framework/uimgbalibrary.jar"/>
+          file="/system_ext/framework/uimgbalibrary.jar"/>
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/UimGbaManager.xml

@@ -6,6 +6,6 @@
 -->
 <permissions>
  <library name="com.qualcomm.qti.uimGbaManager.uimgbamanagerlibrary"
-          file="/product/framework/uimgbamanagerlibrary.jar"
+          file="/system_ext/framework/uimgbamanagerlibrary.jar"
           dependency="com.qualcomm.qti.uimGba.uimgbalibrary"/>
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/UimService.xml

@@ -7,6 +7,6 @@
 
 <permissions>
  <library name="com.qualcomm.qti.uim.uimservicelibrary"
-          file="/product/framework/uimservicelibrary.jar"
+          file="/system_ext/framework/uimservicelibrary.jar"
-          dependency="qti-telephony-hidl-wrapper-prd"/>
+          dependency="qti-telephony-hidl-wrapper"/>
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<permissions>
-    <library name="com.android.hotwordenrollment.common.util" file="/system_ext/framework/com.android.hotwordenrollment.common.util.jar"/>
-</permissions>
-

sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.frameworks.core.addon.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="com.motorola.frameworks.core.addon"
-        file="/system_ext/framework/com.motorola.frameworks.core.addon.jar"/>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.motosignature.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="com.motorola.motosignature"
-        file="/system_ext/framework/com.motorola.motosignature.jar"/>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/com.motorola.software.dolbyui.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <feature name="com.motorola.software.dolbyui"/>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/datachannellib.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (c) 2022 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
- <library name="datachannellib"
-          file="/system_ext/framework/datachannellib.jar"/>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml

@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.qti.lpa.uimlpalibrary"
-          file="/product/framework/uimlpalibrary.jar"/>
+          file="/system_ext/framework/uimlpalibrary.jar"/>
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/moto-checkin.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="moto-checkin"
-        file="/system_ext/framework/moto-checkin.jar"
-        dependency="moto"/>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/moto-settings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="moto-settings"
-        file="/system_ext/framework/moto-settings.jar"/>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/moto.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="moto"
-        file="/system_ext/framework/moto.jar"/>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.dolby.daxservice.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.dolby.daxservice">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-    </privapp-permissions>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.android.providers.settings.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.motorola.android.providers.settings">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/privapp-com.motorola.dolby.dolbyui.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.motorola.dolby.dolbyui">
-        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-</permissions>

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

@@ -46,8 +46,6 @@ 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"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.codeaurora.ims">

sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2014 Qualcomm Technologies, Inc.  All Rights Reserved.
+Qualcomm Technologies Proprietary and Confidential.
+-->
+
+<permissions>
+<library name="com.qualcomm.qti.QtiTelephonyServicelibrary"
+         file="/system/system_ext/framework/QtiTelephonyServicelibrary.jar"/>
+</permissions>

sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml

@@ -7,5 +7,5 @@
 
 <permissions>
  <library name="com.qualcomm.uimremoteclientlibrary"
-          file="/product/framework/uimremoteclientlibrary.jar"/>
+          file="/system_ext/framework/uimremoteclientlibrary.jar"/>
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml

@@ -8,5 +8,5 @@
 
 <permissions>
  <library name="com.qualcomm.uimremoteserverlibrary"
-          file="/product/framework/uimremoteserverlibrary.jar"/>
+          file="/system_ext/framework/uimremoteserverlibrary.jar"/>
 </permissions>

sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml

@@ -1,29 +0,0 @@
-<!--
-/*********************************************************************
- Copyright (c) 2021-2022 Qualcomm Technologies, Inc.
- All Rights Reserved.
- Confidential and Proprietary - Qualcomm Technologies, Inc.
-**********************************************************************/
--->
-<permissions>
-    <library name="vendor.qti.ims.factory-V2.0-java"
-        file="/system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar"/>
-    <library name="vendor.qti.ims.connection-V1.0-java"
-        file="/system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar"/>
-    <library name="vendor.qti.ims.rcsuce-V1.0-java"
-        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>

sdm660-common/proprietary/system_ext/etc/permissions/vendor.qti.imsdcservice.xml

@@ -1,11 +0,0 @@
-<!--
-/*********************************************************************
- Copyright (c) 2022 Qualcomm Technologies, Inc.
- All Rights Reserved.
- Confidential and Proprietary - Qualcomm Technologies, Inc.
-**********************************************************************/
--->
-<permissions>
-<library name="vendor.qti.ims.datachannelservice-V1-java"
-         file="/system_ext/framework/vendor.qti.ims.datachannelservice-V1-java.jar"/>
-</permissions>

sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.dolby.daxservice.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.dolby.daxservice"/>
-    <allow-in-power-save package="com.dolby.daxservice" />
-</config>

sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.android.providers.settings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.motorola.android.providers.settings"/>
-    <allow-in-power-save package="com.motorola.android.providers.settings" />
-</config>

sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.dolby.dolbyui.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.motorola.dolby.dolbyui"/>
-    <allow-in-power-save package="com.motorola.dolby.dolbyui" />
-</config>

sdm660-common/proprietary/system_ext/etc/sysconfig/config-com.motorola.motosignature.app.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
-    <hidden-api-whitelisted-app package="com.motorola.motosignature.app"/>
-    <allow-in-power-save package="com.motorola.motosignature.app" />
-</config>