From 7e6060dc70224a2593b2eb0a28d92ba18538aefe Mon Sep 17 00:00:00 2001 From: Vincent Wang Date: Wed, 2 Aug 2023 05:39:22 +0000 Subject: [PATCH] Revert "Fix biometric context update problem." This reverts commit fcb4e264abaafcd06b232fe0495a67caa26d90d1. Reason for revert: The original CL can't fix bug, we will submit another CL for fixing bug. Change-Id: I6dd591384117aedadf7803d279816e36674e7e28 --- .../aidl/FingerprintAuthenticationClient.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java index 3d0ea9d8bef6a..54d1faa39be0a 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java @@ -260,6 +260,14 @@ class FingerprintAuthenticationClient final AidlSession session = getFreshDaemon(); final OperationContextExt opContext = getOperationContext(); + final ICancellationSignal cancel; + if (session.hasContextMethods()) { + cancel = session.getSession().authenticateWithContext( + mOperationId, opContext.toAidlContext(getOptions())); + } else { + cancel = session.getSession().authenticate(mOperationId); + } + getBiometricContext().subscribe(opContext, ctx -> { if (session.hasContextMethods()) { try { @@ -281,12 +289,7 @@ class FingerprintAuthenticationClient mALSProbeCallback.getProbe().enable(); } - if (session.hasContextMethods()) { - return session.getSession().authenticateWithContext( - mOperationId, opContext.toAidlContext(getOptions())); - } else { - return session.getSession().authenticate(mOperationId); - } + return cancel; } @Override