Merge "Fix biometric context update problem." into udc-qpr-dev

This commit is contained in:
Vincent Wang
2023-07-25 07:35:26 +00:00
committed by Android (Google) Code Review

View File

@@ -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