From fcb4e264abaafcd06b232fe0495a67caa26d90d1 Mon Sep 17 00:00:00 2001
From: Vincent Wang <firewall@google.com>
Date: Fri, 30 Jun 2023 03:36:18 +0000
Subject: [PATCH] Fix biometric context update problem.

Bug: b/288761850
Test: Check b/288761850
Change-Id: I0b0c8e8096ab545c03088cc38bf2d765815e5c2f
---
 .../aidl/FingerprintAuthenticationClient.java     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 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 54d1faa39be0a..3d0ea9d8bef6a 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,14 +260,6 @@ 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 {
@@ -289,7 +281,12 @@ class FingerprintAuthenticationClient
             mALSProbeCallback.getProbe().enable();
         }
 
-        return cancel;
+        if (session.hasContextMethods()) {
+            return session.getSession().authenticateWithContext(
+                    mOperationId, opContext.toAidlContext(getOptions()));
+        } else {
+            return session.getSession().authenticate(mOperationId);
+        }
     }
 
     @Override