fleur: Move to common MediaTek IMS

Signed-off-by: claxten10 <claxten10@gmail.com>

configs/permissions/privapp-permissions-com.mediatek.ims.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.mediatek.ims">
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
-        <permission name="android.permission.CHANGE_WIFI_STATE"/>
-        <permission name="android.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.LOCATION_BYPASS"/>
-    </privapp-permissions>
-</permissions>

device.mk

@@ -15,6 +15,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 # Inherit virtual_ab_ota product
 $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk)
 
+# Inherit common MediaTek IMS
+$(call inherit-product, vendor/mediatek/ims/ims.mk)
+
 # A/B
 PRODUCT_PACKAGES += \
     com.android.hardware.boot \
@@ -183,24 +186,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     IFAAService
 
-# IMS
-PRODUCT_BOOT_JARS += \
-    mediatek-common \
-    mediatek-ims-base \
-    mediatek-ims-common \
-    mediatek-framework \
-    mediatek-telecom-common \
-    mediatek-telephony-base \
-    mediatek-telephony-common \
-    mediatek-ims-extension-plugin
-
-PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/configs/permissions/privapp-permissions-com.mediatek.ims.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-com.mediatek.ims.xml \
-    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml \
-    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 \
-    frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml
-
 # Init
 PRODUCT_PACKAGES += \
     init.connectivity.rc \
@@ -262,7 +247,6 @@ PRODUCT_ENFORCE_RRO_TARGETS := *
 
 PRODUCT_PACKAGES += \
     FrameworkOverlayFleur \
-    TelephonyOverlayFleur \
     TetheringConfigOverlay \
     SettingsOverlayFleur \
     SystemUIOverlayFleur \
@@ -300,7 +284,10 @@ PRODUCT_COPY_FILES += \
 
 # Radio
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml
+    frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml \
+    frameworks/native/data/etc/android.software.ipsec_tunnel_migration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnel_migration.xml \
+    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml \
+    frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml
 
 # Sensors
 PRODUCT_PACKAGES += \

extract-files.py

@@ -38,18 +38,6 @@ lib_fixups: lib_fixups_user_type = {
 }
 
 blob_fixups: blob_fixups_user_type = {
-    'system_ext/priv-app/ImsService/ImsService.apk': blob_fixup()
-        .apktool_patch('blob-patches/ImsService.patch', '-r'),
-
-    'system_ext/lib64/libimsma.so': blob_fixup()
-        .replace_needed('libsink.so', 'libsink-mtk.so'),
-
-    'system_ext/lib64/libsink-mtk.so': blob_fixup()
-        .add_needed('libaudioclient_shim.so'),
-
-    'system_ext/lib64/libsource.so': blob_fixup()
-        .add_needed('libui_shim.so'),
-
     'vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b': blob_fixup()
         .add_needed('libstagefright_foundation-v33.so')
         .replace_needed('libavservices_minijail_vendor.so', 'libavservices_minijail.so'),

overlays/TelephonyOverlayFleur/Android.bp

@@ -1,11 +0,0 @@
-//
-// Copyright (C) 2024 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "TelephonyOverlayFleur",
-
-    product_specific: true,
-}

overlays/TelephonyOverlayFleur/AndroidManifest.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2024 The LineageOS Project
-
-  SPDX-License-Identifier: Apache-2.0
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.telephony.overlay.fleur">
-
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.phone"
-      android:isStatic="true"
-      android:priority="1"/>
-</manifest>

overlays/TelephonyOverlayFleur/res/values/config.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
-     CarrierConfigManager.java. Please consider whether new variables belong
-     there before adding to this file. Variables here should be more closely
-     related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
-    <string name="config_ims_mmtel_package">com.mediatek.ims</string>
-
-    <!-- String indicating the package name of the device ImsService implementation for RCS. -->
-    <string name="config_ims_rcs_package">com.mediatek.ims</string>
-</resources>

proprietary-files.txt

@@ -1272,34 +1272,6 @@ vendor/lib64/hw/vendor.mediatek.hardware.videotelephony@1.0-impl.so
 vendor/lib64/vendor.mediatek.hardware.clientapi@1.0.so
 vendor/lib64/vendor.mediatek.hardware.videotelephony@1.0.so;MODULE_SUFFIX=_vendor
 
-# Radio (MTK-IMS)
-system_ext/bin/vtservice
-system_ext/etc/init/init.vtservice.rc
-system_ext/framework/mediatek-common.jar:system/framework/mediatek-common.jar
-system_ext/framework/mediatek-framework.jar:system/framework/mediatek-framework.jar
-system_ext/framework/mediatek-ims-base.jar:system/framework/mediatek-ims-base.jar
-system_ext/framework/mediatek-ims-common.jar:system/framework/mediatek-ims-common.jar
-system_ext/framework/mediatek-ims-extension-plugin.jar:system/framework/mediatek-ims-extension-plugin.jar
-system_ext/framework/mediatek-telecom-common.jar:system/framework/mediatek-telecom-common.jar
-system_ext/framework/mediatek-telephony-base.jar:system/framework/mediatek-telephony-base.jar
-system_ext/framework/mediatek-telephony-common.jar:system/framework/mediatek-telephony-common.jar
-system_ext/lib64/libcomutils.so
-system_ext/lib64/libimsma.so
-system_ext/lib64/libimsma_adapt.so
-system_ext/lib64/libimsma_rtp.so
-system_ext/lib64/libimsma_socketwrapper.so
-system_ext/lib64/libmtk_vt_service.so
-system_ext/lib64/libmtk_vt_wrapper.so
-system_ext/lib64/libsignal.so
-system_ext/lib64/libsink.so:system_ext/lib64/libsink-mtk.so;FIX_SONAME
-system_ext/lib64/libsource.so
-system_ext/lib64/libvcodec_cap.so
-system_ext/lib64/libvcodec_capenc.so
-system_ext/lib64/libvt_avsync.so
-system_ext/lib64/vendor.mediatek.hardware.videotelephony-V1-ndk.so
-system_ext/lib64/vendor.mediatek.hardware.videotelephony@1.0.so
-system_ext/priv-app/ImsService/ImsService.apk
-
 # Sensors
 vendor/etc/elliptic_sensor.xml
 vendor/lib64/hw/sensors.elliptic@2.0.so

system.prop

@@ -1,8 +1,3 @@
-# IMS
-persist.dbg.volte_avail_ovr=1
-persist.dbg.vt_avail_ovr=1
-persist.dbg.wfc_avail_ovr=0
-
 # Logging
 log.tag=I
 

vendor.prop

@@ -99,12 +99,9 @@ debug.hwui.skia_atrace_enabled=false
 debug.renderengine.backend=skiaglthreaded
 
 # IMS
-persist.vendor.ims_support=1
 persist.vendor.mtk_dynamic_ims_switch=1
 persist.vendor.mtk_wfc_support=0
-persist.vendor.volte_support=1
 persist.vendor.mtk.volte.enable=1
-persist.vendor.vilte_support=1
 persist.vendor.viwifi_support=0
 ro.vendor.md_auto_setup_ims=1
 ro.vendor.mtk_data_config=1