From 4315cd23c7d8040fcf05c9c5333cc49161605e63 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 22 Aug 2024 02:52:46 +0100 Subject: [PATCH] dre: Return to stock IMS system stack Change-Id: I72f838ce6602ee8de1635572791cb7743860a1d7 --- blob-patches/oplus-ims-ext.patch | 40 ++++++++++++++++++++++++++++++++ device.mk | 2 ++ extract-files.sh | 3 +++ proprietary-files.txt | 38 ++++++++++++++++-------------- 4 files changed, 65 insertions(+), 18 deletions(-) create mode 100644 blob-patches/oplus-ims-ext.patch diff --git a/blob-patches/oplus-ims-ext.patch b/blob-patches/oplus-ims-ext.patch new file mode 100644 index 0000000..8ca359c --- /dev/null +++ b/blob-patches/oplus-ims-ext.patch @@ -0,0 +1,40 @@ +--- a/smali/com/oplus/ims/impl/OplusPhoneStateTracker$2.smali ++++ b/smali/com/oplus/ims/impl/OplusPhoneStateTracker$2.smali +@@ -187,7 +187,7 @@ + + .line 154 + :cond_0 +- invoke-virtual {p1}, Landroid/telephony/ServiceState;->getRadioTechnology()I ++ invoke-virtual {p1}, Landroid/telephony/ServiceState;->getRilDataRadioTechnology()I + + move-result v1 + +@@ -199,7 +199,7 @@ + + move-result-object v2 + +- invoke-virtual {v2}, Landroid/telephony/ServiceState;->getRadioTechnology()I ++ invoke-virtual {v2}, Landroid/telephony/ServiceState;->getRilDataRadioTechnology()I + + move-result v2 + +--- a/smali/com/oplus/ims/impl/keyLog/OplusImsKeyLogHelper.smali ++++ b/smali/com/oplus/ims/impl/keyLog/OplusImsKeyLogHelper.smali +@@ -3685,7 +3685,7 @@ + iget-object v0, p0, Lcom/oplus/ims/impl/keyLog/OplusImsKeyLogHelper;->mServiceState:Landroid/telephony/ServiceState; + + .line 334 +- invoke-virtual {v0}, Landroid/telephony/ServiceState;->getRadioTechnology()I ++ invoke-virtual {v0}, Landroid/telephony/ServiceState;->getRilDataRadioTechnology()I + + move-result v0 + +@@ -3696,7 +3696,7 @@ + iget-object v0, p0, Lcom/oplus/ims/impl/keyLog/OplusImsKeyLogHelper;->mServiceState:Landroid/telephony/ServiceState; + + .line 335 +- invoke-virtual {v0}, Landroid/telephony/ServiceState;->getRadioTechnology()I ++ invoke-virtual {v0}, Landroid/telephony/ServiceState;->getRilDataRadioTechnology()I + + move-result v0 + diff --git a/device.mk b/device.mk index 883c5d8..3b0c233 100644 --- a/device.mk +++ b/device.mk @@ -423,6 +423,8 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.telephony.ims.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.ims.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml +$(call inherit-product, hardware/oplus/oplus-fwk/oplus-fwk.mk) + # Thermal PRODUCT_PACKAGES += \ android.hardware.thermal@2.0-service.qti diff --git a/extract-files.sh b/extract-files.sh index 7dc70bf..82eedec 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -58,6 +58,9 @@ function blob_fixup() { product/etc/sysconfig/com.android.hotwordenrollment.common.util.xml) sed -i "s/\/my_product/\/product/" "${2}" ;; + system_ext/framework/oplus-ims-ext.jar) + apktool_patch "${2}" "${MY_DIR}/blob-patches/oplus-ims-ext.patch" -r + ;; system_ext/lib64/libwfdnative.so) sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}" ;; diff --git a/proprietary-files.txt b/proprietary-files.txt index 4e5a386..d47486a 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1110,25 +1110,27 @@ my_product/framework/com.android.hotwordenrollment.common.util.jar:product/frame my_product/priv-app/HotwordEnrollmentOKGoogleHEXAGON.apk:product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk my_product/priv-app/HotwordEnrollmentXGoogleHEXAGON.apk:product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk -# IMS - from renoir - 22.5.11 -system_ext/app/ImsRcsService/ImsRcsService.apk|d03d3142f3518e755d02ace26b17170218ed8b4b -system_ext/app/QtiTelephony/QtiTelephony.apk|f2ea59dfc69126c83905979e2d55d7c5f02e15e1 -system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml|a7e114ea1e6909685ce49717a2b5b66d8275d419 -system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml|54487895eb4c26e6ec642538dba910de9b092c81 -system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml|83fb6029772c3a425dbd5cd45a61ca9d427e7604 -system_ext/etc/sysconfig/qti_whitelist_system_ext.xml|e34b3affaef4e4ee135cbeec8d7c3e8c6cfd65ce -system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar|a5791aa90552999909e52648d576055a8c533397 -system_ext/lib64/lib-imsvideocodec.so|e1e994cb122ad48b77ae10295a29bcfbe84e4d22 -system_ext/lib64/lib-imsvt.so|38b39cafe351be5abc7b6ae5055ea1f390032502 -system_ext/lib64/lib-imsvtextutils.so|16bed08e80919635fcb7ace934bd5f16f059c182 -system_ext/lib64/lib-imsvtutils.so|9e45b76b14600df92782e6c8213af0dcddbe80be -system_ext/lib64/libdiag_system.so|35bace09ba74af348b9530fb02cf7088c90a44fd -system_ext/lib64/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimscamera_jni.so|ff3d65093f5bf19fba95798b0a121ee510b0f72e -system_ext/lib64/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimsmedia_jni.so|9f192af40439abb04d5d5f0f3de5b772c9381114 -system_ext/lib64/vendor.qti.imsrtpservice@3.0.so|0c11ff5a7a671073ee40e17d46aa8b7acbf1dc0a -system_ext/priv-app/ims/ims.apk|f0d834acbc77e7830459e0246f5073e1b9ba8657 - # IMS +system_ext/app/ImsRcsService/ImsRcsService.apk +system_ext/app/QtiTelephony/QtiTelephony.apk +system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml +system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml +system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml +system_ext/etc/sysconfig/qti_whitelist_system_ext.xml +system_ext/framework/oplus-ims-ext.jar +system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar +system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar +system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar +system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar +system_ext/lib64/lib-imsvideocodec.so +system_ext/lib64/lib-imsvt.so +system_ext/lib64/lib-imsvtextutils.so +system_ext/lib64/lib-imsvtutils.so +system_ext/lib64/libdiag_system.so +system_ext/lib64/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimscamera_jni.so +system_ext/lib64/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimsmedia_jni.so +system_ext/lib64/vendor.qti.imsrtpservice@3.0.so +system_ext/priv-app/ims/ims.apk vendor/bin/ims_rtp_daemon vendor/bin/imsdaemon vendor/etc/init/imsdaemon.rc