sm8350-common: Migrate to fingerprint HIDL v2.3

Change-Id: Ibf065cfb9b6b8210713ab6dba8302937f56cf4c1
This commit is contained in:
Bruno Martins 2022-01-14 16:33:28 +00:00
parent 357da80ad6
commit 9b930e1eea
7 changed files with 19 additions and 16 deletions

View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2021 The LineageOS Project # Copyright (C) 2021-2022 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -131,9 +131,7 @@ TARGET_ENABLE_MEDIADRM_64 := true
TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/config.fs
# Fingerprint # Fingerprint
SOONG_CONFIG_NAMESPACES += ONEPLUS_FOD TARGET_SURFACEFLINGER_UDFPS_LIB := //hardware/oneplus:libudfps_extension.oneplus
SOONG_CONFIG_ONEPLUS_FOD := POS_X POS_Y SIZE
TARGET_SURFACEFLINGER_FOD_LIB := //hardware/oneplus:libfod_extension.oneplus
# HIDL # HIDL
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \

View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2021 The LineageOS Project # Copyright (C) 2021-2022 The LineageOS Project
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -90,8 +90,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml \ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml \
frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \ frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \
frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
vendor/lineage/config/permissions/vendor.lineage.biometrics.fingerprint.inscreen.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.lineage.biometrics.fingerprint.inscreen.xml
# A/B # A/B
AB_OTA_POSTINSTALL_CONFIG += \ AB_OTA_POSTINSTALL_CONFIG += \
@ -309,9 +308,8 @@ PRODUCT_PACKAGES += \
# Fingerprint # Fingerprint
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.biometrics.fingerprint@2.1-service.oneplus \ android.hardware.biometrics.fingerprint@2.3-service.oneplus \
vendor.goodix.hardware.biometrics.fingerprint@2.1.vendor \ vendor.goodix.hardware.biometrics.fingerprint@2.1.vendor
vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus
# Gatekeeper # Gatekeeper
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

View file

@ -9,6 +9,14 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="hidl" optional="true">
<name>android.hardware.biometrics.fingerprint</name>
<version>2.3</version>
<interface>
<name>IBiometricsFingerprint</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true"> <hal format="hidl" optional="true">
<name>android.hardware.gnss</name> <name>android.hardware.gnss</name>
<version>1.0-1</version> <version>1.0-1</version>

View file

@ -33,8 +33,7 @@
/dev/skin_thermal u:object_r:therm_device:s0 /dev/skin_thermal u:object_r:therm_device:s0
# HALs # HALs
/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.oneplus u:object_r:hal_fingerprint_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.3-service\.oneplus u:object_r:hal_fingerprint_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.lineage\.biometrics\.fingerprint\.inscreen@1\.0-service\.oneplus u:object_r:hal_lineage_fod_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.oneplus u:object_r:hal_lineage_livedisplay_qti_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.oneplus u:object_r:hal_lineage_livedisplay_qti_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.lineage\.powershare@1\.0-service\.oneplus u:object_r:hal_lineage_powershare_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.powershare@1\.0-service\.oneplus u:object_r:hal_lineage_powershare_default_exec:s0
/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus u:object_r:hal_lineage_touch_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus u:object_r:hal_lineage_touch_default_exec:s0

View file

@ -3,11 +3,13 @@ genfscon proc /touchpanel u:object_r:proc_touchpanel:s
# sysfs # sysfs
genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-10/10-005a/leds/vibrator u:object_r:sysfs_leds:s0 genfscon sysfs /devices/platform/soc/88c000.i2c/i2c-10/10-005a/leds/vibrator u:object_r:sysfs_leds:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/auth_status u:object_r:sysfs_fod:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/dim_alpha u:object_r:sysfs_fod:s0 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/dim_alpha u:object_r:sysfs_fod:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/dimlayer_bl_en u:object_r:sysfs_livedisplay_tuneable:s0 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/dimlayer_bl_en u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/hbm u:object_r:sysfs_livedisplay_tuneable:s0 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/hbm u:object_r:sysfs_livedisplay_tuneable:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/notify_dim u:object_r:sysfs_fod:s0 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/notify_dim u:object_r:sysfs_fod:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/notify_fppress u:object_r:sysfs_fod:s0 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/notify_fppress u:object_r:sysfs_fod:s0
genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/drm/card0/card0-DSI-1/power_status u:object_r:sysfs_fod:s0
genfscon sysfs /devices/platform/soc/soc:tri_state_key/hall_data_calib u:object_r:sysfs_tri_state_key:s0 genfscon sysfs /devices/platform/soc/soc:tri_state_key/hall_data_calib u:object_r:sysfs_tri_state_key:s0
genfscon sysfs /kernel/ois_control u:object_r:sysfs_ois_control:s0 genfscon sysfs /kernel/ois_control u:object_r:sysfs_ois_control:s0
genfscon sysfs /kernel/tof_control u:object_r:sysfs_tof_control:s0 genfscon sysfs /kernel/tof_control u:object_r:sysfs_tof_control:s0

View file

@ -1,3 +1,5 @@
hal_client_domain(hal_fingerprint_default, hal_display)
allow hal_fingerprint_default self:netlink_socket create_socket_perms_no_ioctl; allow hal_fingerprint_default self:netlink_socket create_socket_perms_no_ioctl;
binder_call(hal_fingerprint_default, hal_perf_default) binder_call(hal_fingerprint_default, hal_perf_default)

View file

@ -1,4 +0,0 @@
hal_client_domain(hal_lineage_fod_default, hal_display)
hal_client_domain(hal_lineage_fod_default, hal_fingerprint)
allow hal_lineage_fod_default sysfs_fod:file rw_file_perms;