Merge "Remove uneeded init.qfp.sh." into udc-qpr-dev am: 0c0476f5ad

Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/24532187

Change-Id: I9181f45d4fef7f5c30812e516fe405e0632e3a3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alec Foster 2023-08-24 21:24:37 +00:00 committed by Automerger Merge Worker
commit dec6bf2b42
2 changed files with 2 additions and 55 deletions

View file

@ -1,52 +0,0 @@
#!/vendor/bin/sh
QTI_VFS_DIR=/data/vendor/misc/qti_fp
VFS_CALIB_PATH=$QTI_VFS_DIR/vfs_calib.dat
VFS_CALIB_SRC=/vendor/etc/qti_fp/vfs_calib.dat
# Update prop if not already set.
init_prop() {
PROP=`getprop $1`
if [[ -z "$PROP" ]]
then
setprop $1 "$2"
fi
}
# Clear prop
clear_prop() {
setprop $1 ""
}
UPDATE_VFS=`getprop persist.vendor.qfp.update_vfs_calib`
# Copy if file doesn't exist or if the persist flag is set.
if [[ ! -f $VFS_CALIB_PATH || $UPDATE_VFS -eq 1 ]]; then
log -p v "QFP: Updating vfs_calib.dat"
mkdir -p $QTI_VFS_DIR
chmod 0777 $QTI_VFS_DIR
cp $VFS_CALIB_SRC $VFS_CALIB_PATH
chmod 0777 $VFS_CALIB_PATH
chown system:system $VFS_CALIB_PATH
# Clear the flag after the initial copy.
clear_prop persist.vendor.qfp.update_vfs_calib
fi
init_prop persist.vendor.qfp.enable_pv "12 0 0"
init_prop persist.vendor.qfp.enable_setprop 0
# If enable_setprop is 0 (disabled), delete the set props and use the hardcoded.
if [[ `getprop persist.vendor.qfp.enable_setprop` -eq 0 ]]; then
clear_prop persist.vendor.qfp
clear_prop persist.vendor.qfp.enable_intr2
clear_prop persist.vendor.qfp.enable_fd
clear_prop persist.vendor.qfp.enable_td
clear_prop persist.vendor.qfp.enable_ntz
clear_prop persist.vendor.qfp.fd_events_src
clear_prop persist.vendor.qfp.tz_srv_name
clear_prop persist.vendor.qfp.tz_dev_name
clear_prop persist.vendor.qfp.vfs_info
fi
# Default to debug log level
init_prop log.tag.QFP 3

View file

@ -27,13 +27,12 @@ PRODUCT_COPY_FILES += \
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/caimito/fingerprint/device_framework_matrix_product.xml
PRODUCT_COPY_FILES += \
device/google/caimito/fingerprint/init.qfp.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qfp.sh
#$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.qfp.update_vfs_calib=1
persist.vendor.qfp.enable_setprop=0 \
log.tag.QFP=3
ifneq (,$(findstring factory, $(TARGET_PRODUCT)))
PRODUCT_PACKAGES += QfsFactoryTest