diff --git a/Android.bp b/Android.bp index 179a9a7..a443a82 100644 --- a/Android.bp +++ b/Android.bp @@ -87,17 +87,6 @@ android_app_import { soc_specific: true, } -android_app_import { - name: "QFingerprintService", - owner: "xiaomi", - apk: "proprietary/vendor/app/QFingerprintService/QFingerprintService.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - soc_specific: true, -} - android_app_import { name: "TimeService", owner: "xiaomi", @@ -200,28 +189,6 @@ android_app_import { system_ext_specific: true, } -android_app_import { - name: "JVFactoryTest", - owner: "xiaomi", - apk: "proprietary/odm/app/JVFactoryTest/JVFactoryTest.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - device_specific: true, -} - -android_app_import { - name: "goodix_sz", - owner: "xiaomi", - apk: "proprietary/odm/app/goodix_sz/goodix_sz.apk", - certificate: "platform", - dex_preopt: { - enabled: false, - }, - device_specific: true, -} - dex_import { name: "WfdCommon", owner: "xiaomi", @@ -401,15 +368,6 @@ dex_import { system_ext_specific: true, } -prebuilt_etc_xml { - name: "AHBF-V3-service.xml", - owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/AHBF-V3-service.xml", - filename_from_src: true, - sub_dir: "vintf/manifest", - soc_specific: true, -} - prebuilt_etc_xml { name: "ImsRtpService-aidl.xml", owner: "xiaomi", @@ -635,15 +593,6 @@ prebuilt_etc_xml { soc_specific: true, } -prebuilt_etc_xml { - name: "fod-aidl.xml", - owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/fod-aidl.xml", - filename_from_src: true, - sub_dir: "vintf/manifest", - soc_specific: true, -} - prebuilt_etc_xml { name: "imsdcservice-saidl.xml", owner: "xiaomi", diff --git a/peridot-vendor.mk b/peridot-vendor.mk index 97bcc75..cdd88bb 100644 --- a/peridot-vendor.mk +++ b/peridot-vendor.mk @@ -904,8 +904,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/peridot/proprietary/odm/lib64/camera/plugins/com.xiaomi.plugin.watermark.so:$(TARGET_COPY_OUT_ODM)/lib64/camera/plugins/com.xiaomi.plugin.watermark.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/hw/consumerir.qcom.so:$(TARGET_COPY_OUT_ODM)/lib64/hw/consumerir.qcom.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/hw/displayfeature.default.so:$(TARGET_COPY_OUT_ODM)/lib64/hw/displayfeature.default.so \ - vendor/xiaomi/peridot/proprietary/odm/lib64/hw/fingerprint.goodix_fod.so:$(TARGET_COPY_OUT_ODM)/lib64/hw/fingerprint.goodix_fod.so \ - vendor/xiaomi/peridot/proprietary/odm/lib64/hw/fingerprint.jiiov.so:$(TARGET_COPY_OUT_ODM)/lib64/hw/fingerprint.jiiov.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/libAncHumanVideoBokehV4.so:$(TARGET_COPY_OUT_ODM)/lib64/libAncHumanVideoBokehV4.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/libMiDispDevManager.so:$(TARGET_COPY_OUT_ODM)/lib64/libMiDispDevManager.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/libTrueSight.so:$(TARGET_COPY_OUT_ODM)/lib64/libTrueSight.so \ @@ -940,7 +938,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/peridot/proprietary/odm/lib64/libeyecare.so:$(TARGET_COPY_OUT_ODM)/lib64/libeyecare.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/libflatmode.so:$(TARGET_COPY_OUT_ODM)/lib64/libflatmode.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/libfpsmonitor.so:$(TARGET_COPY_OUT_ODM)/lib64/libfpsmonitor.so \ - vendor/xiaomi/peridot/proprietary/odm/lib64/libgf_hal.so:$(TARGET_COPY_OUT_ODM)/lib64/libgf_hal.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/libhistprocess.so:$(TARGET_COPY_OUT_ODM)/lib64/libhistprocess.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/liblocalFlickerDet.so:$(TARGET_COPY_OUT_ODM)/lib64/liblocalFlickerDet.so \ vendor/xiaomi/peridot/proprietary/odm/lib64/libmi-stc-HW-modulate.so:$(TARGET_COPY_OUT_ODM)/lib64/libmi-stc-HW-modulate.so \ @@ -1064,7 +1061,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/peridot/proprietary/vendor/bin/hw/android.hardware.security.keymint-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.security.keymint-service-qti \ vendor/xiaomi/peridot/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.strongbox-nxp:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.security.keymint-service.strongbox-nxp \ vendor/xiaomi/peridot/proprietary/vendor/bin/hw/android.hardware.weaver-service.nxp-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.weaver-service.nxp-qti \ - vendor/xiaomi/peridot/proprietary/vendor/bin/hw/mfp-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/hw/mfp-daemon \ vendor/xiaomi/peridot/proprietary/vendor/bin/hw/qconfigservice:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qconfigservice \ vendor/xiaomi/peridot/proprietary/vendor/bin/hw/qcrilNrd:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrilNrd \ vendor/xiaomi/peridot/proprietary/vendor/bin/hw/qvrservice:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qvrservice \ @@ -1334,7 +1330,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/peridot/proprietary/vendor/etc/init/ims_rtp_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ims_rtp_daemon.rc \ vendor/xiaomi/peridot/proprietary/vendor/etc/init/imsdaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdaemon.rc \ vendor/xiaomi/peridot/proprietary/vendor/etc/init/init.charge_logger.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.charge_logger.rc \ - vendor/xiaomi/peridot/proprietary/vendor/etc/init/init.mfp-daemon.aidl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.mfp-daemon.aidl.rc \ vendor/xiaomi/peridot/proprietary/vendor/etc/init/init.qti.graphics.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.graphics.rc \ vendor/xiaomi/peridot/proprietary/vendor/etc/init/init.qti.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.media.rc \ vendor/xiaomi/peridot/proprietary/vendor/etc/init/init.time_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.time_daemon.rc \ @@ -1442,7 +1437,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/peridot/proprietary/vendor/etc/perf/thermalbreakboostconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/thermalbreakboostconfig.xml \ vendor/xiaomi/peridot/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.jc-strongbox-keymint3-nxp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hardware_keystore.jc-strongbox-keymint3-nxp.xml \ vendor/xiaomi/peridot/proprietary/vendor/etc/permissions/noRil/apq_excluded_telephony_features.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/noRil/apq_excluded_telephony_features.xml \ - vendor/xiaomi/peridot/proprietary/vendor/etc/permissions/qti_fingerprint_interface.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/qti_fingerprint_interface.xml \ vendor/xiaomi/peridot/proprietary/vendor/etc/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt \ vendor/xiaomi/peridot/proprietary/vendor/etc/qcril_database/qcrilNr.db:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/qcrilNr.db \ vendor/xiaomi/peridot/proprietary/vendor/etc/qcril_database/upgrade/config/0006.0_config.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/config/0006.0_config.sql \ @@ -1785,7 +1779,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/peridot/proprietary/vendor/lib64/camera/fdconfigvideolite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideolite.bin \ vendor/xiaomi/peridot/proprietary/vendor/lib64/camx.device-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camx.device-impl.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/camx.provider-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camx.provider-impl.so \ - vendor/xiaomi/peridot/proprietary/vendor/lib64/com.fingerprints.extension3-V1-ndk.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.fingerprints.extension3-V1-ndk.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/com.qti.camx.chiiqutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.camx.chiiqutils.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/com.qti.chiusecaseselector.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.chiusecaseselector.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/com.qti.feature2.afbrckt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/com.qti.feature2.afbrckt.so \ @@ -2731,8 +2724,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.xiaomi.hardware.bgservice@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.bgservice@1.0.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.xiaomi.hardware.displayfeature@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.displayfeature@1.0.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.xiaomi.hardware.displayfeature_aidl-V2-ndk.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.displayfeature_aidl-V2-ndk.so \ - vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.xiaomi.hardware.fingerprintextension-V1-ndk.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.fingerprintextension-V1-ndk.so \ - vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.xiaomi.hardware.fx.tunnel-V1-ndk.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.fx.tunnel-V1-ndk.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.xiaomi.hardware.mlipay-V1-ndk_platform.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.mlipay-V1-ndk_platform.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.xiaomi.hardware.quickcamera-V1-ndk_platform.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hardware.quickcamera-V1-ndk_platform.so \ vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.xiaomi.hw.touchfeature-V1-ndk.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.xiaomi.hw.touchfeature-V1-ndk.so \ @@ -2746,7 +2737,6 @@ PRODUCT_PACKAGES += \ CACertService \ CneApp \ IWlanService \ - QFingerprintService \ TimeService \ uimgbaservice \ ImsRcsService \ @@ -2756,8 +2746,6 @@ PRODUCT_PACKAGES += \ WfdService \ ims \ qcrilmsgtunnel \ - JVFactoryTest \ - goodix_sz \ WfdCommon \ androidx.camera.extensions.impl \ uimgbalibrary \ @@ -2778,7 +2766,6 @@ PRODUCT_PACKAGES += \ vendor.qti.ims.rcsuce-V1.1-java \ vendor.qti.ims.rcsuce-V1.2-java \ vendor.qti.ims.rcsuceaidlservice-V1-java \ - AHBF-V3-service.xml \ ImsRtpService-aidl.xml \ android.hardware.drm_wfdhdcp-service.xml \ android.hardware.gnss-aidl-service-qti.xml \ @@ -2804,7 +2791,6 @@ PRODUCT_PACKAGES += \ datafactoryservice-saidl.xml \ deviceinfo-saidl.xml \ dpm-saidl.xml \ - fod-aidl.xml \ imsdcservice-saidl.xml \ manifest_identity_credential.xml \ manifest_non_qmaa.xml \ diff --git a/proprietary/odm/app/JVFactoryTest/JVFactoryTest.apk b/proprietary/odm/app/JVFactoryTest/JVFactoryTest.apk deleted file mode 100644 index 3f720bb..0000000 Binary files a/proprietary/odm/app/JVFactoryTest/JVFactoryTest.apk and /dev/null differ diff --git a/proprietary/odm/app/goodix_sz/goodix_sz.apk b/proprietary/odm/app/goodix_sz/goodix_sz.apk deleted file mode 100644 index 72d3c12..0000000 Binary files a/proprietary/odm/app/goodix_sz/goodix_sz.apk and /dev/null differ diff --git a/proprietary/odm/lib64/hw/fingerprint.goodix_fod.so b/proprietary/odm/lib64/hw/fingerprint.goodix_fod.so deleted file mode 100644 index 64249d1..0000000 Binary files a/proprietary/odm/lib64/hw/fingerprint.goodix_fod.so and /dev/null differ diff --git a/proprietary/odm/lib64/hw/fingerprint.jiiov.so b/proprietary/odm/lib64/hw/fingerprint.jiiov.so deleted file mode 100644 index 953ebe3..0000000 Binary files a/proprietary/odm/lib64/hw/fingerprint.jiiov.so and /dev/null differ diff --git a/proprietary/odm/lib64/libgf_hal.so b/proprietary/odm/lib64/libgf_hal.so deleted file mode 100644 index a0d7d87..0000000 Binary files a/proprietary/odm/lib64/libgf_hal.so and /dev/null differ diff --git a/proprietary/vendor/app/QFingerprintService/QFingerprintService.apk b/proprietary/vendor/app/QFingerprintService/QFingerprintService.apk deleted file mode 100644 index aeb9f93..0000000 Binary files a/proprietary/vendor/app/QFingerprintService/QFingerprintService.apk and /dev/null differ diff --git a/proprietary/vendor/bin/hw/mfp-daemon b/proprietary/vendor/bin/hw/mfp-daemon deleted file mode 100755 index b69ea30..0000000 Binary files a/proprietary/vendor/bin/hw/mfp-daemon and /dev/null differ diff --git a/proprietary/vendor/etc/init/init.mfp-daemon.aidl.rc b/proprietary/vendor/etc/init/init.mfp-daemon.aidl.rc deleted file mode 100644 index 714b588..0000000 --- a/proprietary/vendor/etc/init/init.mfp-daemon.aidl.rc +++ /dev/null @@ -1,56 +0,0 @@ -service mfp-daemon /vendor/bin/hw/mfp-daemon - interface aidl android.hardware.biometrics.fingerprint.IFingerprint/virtual - class late_start - user system - group system drmrpc diag input uhid - seclabel u:r:vendor_mfp-daemon:s0 - capabilities SYS_NICE - -on early-boot - chown system graphics /sys/bus/platform/devices/soc:xiaomi_fingerprint/fingerdown - chmod 0664 /sys/bus/platform/devices/soc:xiaomi_fingerprint/fingerdown - -on boot - chmod 0666 /dev/goodix_fp - chown system system /dev/goodix_fp - chmod 0666 /dev/xiaomi-fp - chown system system /dev/xiaomi-fp - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/irq - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/irq_enable - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/wakeup_enable - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/hw_reset - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/device_prepare - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/fingerdown_wait - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/vendor - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/request_vreg - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/simulate_irq - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/finger_irq - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/power_cfg - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/power_ctrl - chown system system /sys/bus/platform/devices/soc:fingerprint_fpc/screen - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/irq - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/wakeup_enable - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/hw_reset - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/device_prepare - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/vendor - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/request_vreg - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/simulate_irq - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/finger_irq - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/power_cfg - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/power_ctrl - chmod 0700 /sys/bus/platform/devices/soc:fingerprint_fpc/screen - chmod 0666 /dev/input/event2 - -on post-fs-data - mkdir /data/vendor/misc 01771 system system - mkdir /data/vendor/misc/mi_fp 0770 system system - mkdir /persist/mi_fp 0770 system system - mkdir /mnt/vendor/persist/mi_fp 0770 system system - mkdir /data/vendor/fpc 0770 system system - mkdir /data/vendor/fpdump 0770 system system - mkdir /data/vendor/goodix 0770 system system - mkdir /data/vendor/fingerprint 0770 system system - mkdir /mnt/vendor/persist/goodix 0770 system system - -on property:vendor.fps_hal.restartimes=max - stop mfp-daemon diff --git a/proprietary/vendor/etc/permissions/qti_fingerprint_interface.xml b/proprietary/vendor/etc/permissions/qti_fingerprint_interface.xml deleted file mode 100644 index 240c0f9..0000000 --- a/proprietary/vendor/etc/permissions/qti_fingerprint_interface.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/proprietary/vendor/etc/vintf/manifest/AHBF-V3-service.xml b/proprietary/vendor/etc/vintf/manifest/AHBF-V3-service.xml deleted file mode 100644 index e977b98..0000000 --- a/proprietary/vendor/etc/vintf/manifest/AHBF-V3-service.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - android.hardware.biometrics.fingerprint - 3 - IFingerprint/virtual - - diff --git a/proprietary/vendor/etc/vintf/manifest/fod-aidl.xml b/proprietary/vendor/etc/vintf/manifest/fod-aidl.xml deleted file mode 100644 index c665c15..0000000 --- a/proprietary/vendor/etc/vintf/manifest/fod-aidl.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - vendor.xiaomi.hardware.fingerprintextension - 1 - IXiaomiFingerprint/default - - - com.fingerprints.extension3 - 1 - IFingerprintSensorTest/default - - - com.fingerprints.extension3 - 1 - IFingerprintNavigation/default - - - vendor.xiaomi.hardware.fx.tunnel - 1 - IMiFxTunnel/default - - - vendor.xiaomi.hardware.dtool1 - 1 - IDtool/default - - diff --git a/proprietary/vendor/lib64/com.fingerprints.extension3-V1-ndk.so b/proprietary/vendor/lib64/com.fingerprints.extension3-V1-ndk.so deleted file mode 100644 index c424d9e..0000000 Binary files a/proprietary/vendor/lib64/com.fingerprints.extension3-V1-ndk.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.xiaomi.hardware.fingerprintextension-V1-ndk.so b/proprietary/vendor/lib64/vendor.xiaomi.hardware.fingerprintextension-V1-ndk.so deleted file mode 100644 index e2c11e1..0000000 Binary files a/proprietary/vendor/lib64/vendor.xiaomi.hardware.fingerprintextension-V1-ndk.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.xiaomi.hardware.fx.tunnel-V1-ndk.so b/proprietary/vendor/lib64/vendor.xiaomi.hardware.fx.tunnel-V1-ndk.so deleted file mode 100644 index 8ef47aa..0000000 Binary files a/proprietary/vendor/lib64/vendor.xiaomi.hardware.fx.tunnel-V1-ndk.so and /dev/null differ