commit 41de6a3dac5177b9528efd840981f55701f36eb2
author Jan Altensen <info@stricted.net> Wed Aug 21 23:34:48 2019 +0200
committer Jan Altensen <info@stricted.net> Tue Mar 10 15:41:39 2020 +0100
tree efbc4e50e0f72731d0115c06052c9dba2c5760a4
parent 16d1a36299c4f45655e59a33d893a5b96f5033c9

samsung: hidl: fingerprint: call notify on cancel

Change-Id: Idb1b3200e571c546441fa9c0cfd1a1728e165a96

hidl/fingerprint/Android.mk

diff --git a/hidl/fingerprint/Android.mk b/hidl/fingerprint/Android.mk
index 8f644b0..9070cd8 100644
--- a/hidl/fingerprint/Android.mk
+++ b/hidl/fingerprint/Android.mk
@@ -31,6 +31,10 @@
     libutils \
     android.hardware.biometrics.fingerprint@2.1
 
+ifeq ($(TARGET_SEC_FP_CALL_NOTIFY_ON_CANCEL),true)
+    LOCAL_CFLAGS += -DCALL_NOTIFY_ON_CANCEL
+endif
+
 ifeq ($(TARGET_SEC_FP_USES_PERCENTAGE_SAMPLES),true)
     LOCAL_CFLAGS += -DUSES_PERCENTAGE_SAMPLES
 endif

hidl/fingerprint/BiometricsFingerprint.cpp

diff --git a/hidl/fingerprint/BiometricsFingerprint.cpp b/hidl/fingerprint/BiometricsFingerprint.cpp
index bb27999..f9b3d15 100644
--- a/hidl/fingerprint/BiometricsFingerprint.cpp
+++ b/hidl/fingerprint/BiometricsFingerprint.cpp
@@ -173,7 +173,18 @@
 }
 
 Return<RequestStatus> BiometricsFingerprint::cancel() {
-    return ErrorFilter(ss_fingerprint_cancel());
+    int32_t ret = ss_fingerprint_cancel();
+
+#ifdef CALL_NOTIFY_ON_CANCEL
+    if (ret == 0) {
+        fingerprint_msg_t msg{};
+        msg.type = FINGERPRINT_ERROR;
+        msg.data.error = FINGERPRINT_ERROR_CANCELED;
+        notify(&msg);
+    }
+#endif
+
+    return ErrorFilter(ret);
 }
 
 Return<RequestStatus> BiometricsFingerprint::enumerate() {