diff --git a/Aerodactyl-vendor.mk b/Aerodactyl-vendor.mk index 1f9857f..b4dca8a 100644 --- a/Aerodactyl-vendor.mk +++ b/Aerodactyl-vendor.mk @@ -283,7 +283,6 @@ PRODUCT_COPY_FILES += \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/vendor.mediatek.hardware.pq_aidl-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.pq_aidl-service.rc \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/vendor.noth.hardware.sensor.sensor_extension-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.noth.hardware.sensor.sensor_extension-service.rc \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/vendor.trustonic.tee@1.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.trustonic.tee@1.1-service.rc \ - vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/volte_clientapi_ua.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/volte_clientapi_ua.rc \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/wlan_assistant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wlan_assistant.rc \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/libnfc-hal-st-st54j.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st-st54j.conf \ vendor/nothing/Aerodactyl/proprietary/vendor/etc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ @@ -1022,7 +1021,6 @@ PRODUCT_PACKAGES += \ vendor.mediatek.hardware.camera.isphal@1.1 \ vendor.mediatek.hardware.camera.postproc@1.0 \ vendor.mediatek.hardware.camera.security@1.0 \ - vendor.mediatek.hardware.clientapi@1.0 \ vendor.mediatek.hardware.composer_ext@1.0 \ vendor.mediatek.hardware.gnss.batching-V1-ndk \ vendor.mediatek.hardware.lbs@1.0 \ @@ -1155,6 +1153,7 @@ PRODUCT_PACKAGES += \ HotwordEnrollmentXGoogleHEXAGON \ ImsService \ MtkGbaService \ + MtkTelephonyAssist \ com.android.hotwordenrollment.common.util \ mediatek-ims-base \ mediatek-ims-common \ @@ -1215,7 +1214,6 @@ PRODUCT_PACKAGES += \ nvram_daemon \ thermal_core \ thermal_intf \ - volte_clientapi_ua \ wlan_assistant \ vtservice diff --git a/Android.bp b/Android.bp index 3a7e1f8..2a3a49b 100644 --- a/Android.bp +++ b/Android.bp @@ -20217,34 +20217,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.clientapi@1.0", - owner: "nothing", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.mediatek.hardware.clientapi@1.0.so", - ], - shared_libs: [ - "libhidlbase", - "liblog", - "libutils", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.mediatek.hardware.composer_ext@1.0", owner: "nothing", @@ -24045,6 +24017,18 @@ android_app_import { system_ext_specific: true, } +android_app_import { + name: "MtkTelephonyAssist", + owner: "nothing", + apk: "proprietary/system_ext/priv-app/MtkTelephonyAssist/MtkTelephonyAssist.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + dex_import { name: "com.android.hotwordenrollment.common.util", owner: "nothing", @@ -25404,41 +25388,6 @@ cc_prebuilt_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "volte_clientapi_ua", - owner: "nothing", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/volte_clientapi_ua", - ], - shared_libs: [ - "libbase", - "libcutils", - "libfmq", - "liblog", - "libutils", - "libhardware", - "libhidlbase", - "libhidltransport", - "libhwbinder", - "vendor.mediatek.hardware.clientapi@1.0", - "libhardware_legacy", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - soc_specific: true, -} - cc_prebuilt_binary { name: "wlan_assistant", owner: "nothing", diff --git a/proprietary/system_ext/priv-app/MtkTelephonyAssist/MtkTelephonyAssist.apk b/proprietary/system_ext/priv-app/MtkTelephonyAssist/MtkTelephonyAssist.apk new file mode 100644 index 0000000..4cb8210 Binary files /dev/null and b/proprietary/system_ext/priv-app/MtkTelephonyAssist/MtkTelephonyAssist.apk differ diff --git a/proprietary/vendor/bin/volte_clientapi_ua b/proprietary/vendor/bin/volte_clientapi_ua deleted file mode 100755 index 0f1d327..0000000 Binary files a/proprietary/vendor/bin/volte_clientapi_ua and /dev/null differ diff --git a/proprietary/vendor/etc/init/volte_clientapi_ua.rc b/proprietary/vendor/etc/init/volte_clientapi_ua.rc deleted file mode 100644 index dbf6268..0000000 --- a/proprietary/vendor/etc/init/volte_clientapi_ua.rc +++ /dev/null @@ -1,16 +0,0 @@ -# -# volte_clientapi_ua specific system properties -# -on property:sys.boot_completed=1 && property:persist.vendor.clientapi_support=1 - start volte_clientapi_ua - -# -# volte_clientapi_ua specific system service and socket information -# -service volte_clientapi_ua /vendor/bin/volte_clientapi_ua - class hal - socket volte_clientapi stream 666 root system - user system - group system log inet radio - disabled - diff --git a/proprietary/vendor/lib64/vendor.mediatek.hardware.clientapi@1.0.so b/proprietary/vendor/lib64/vendor.mediatek.hardware.clientapi@1.0.so deleted file mode 100644 index 96953b2..0000000 Binary files a/proprietary/vendor/lib64/vendor.mediatek.hardware.clientapi@1.0.so and /dev/null differ