Merge "Fix biometric context update problem." into udc-qpr-dev am: 67e5d55046 am: 4f95fe9506

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23870443

Change-Id: Id0468fd86833c68de4837155940a82590e09c8df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files 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 54d1faa39be0..3d0ea9d8bef6 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