Merge "Add a hack that ensures face auth failed message is not shown after face lockout" into udc-dev

This commit is contained in:
Chandru S
2023-05-13 04:04:27 +00:00
committed by Android (Google) Code Review

View File

@@ -1460,6 +1460,14 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
ErrorAuthenticationStatus error = (ErrorAuthenticationStatus) status;
handleFaceError(error.getMsgId(), error.getMsg());
} else if (status instanceof FailedAuthenticationStatus) {
if (isFaceLockedOut()) {
// TODO b/270090188: remove this hack when biometrics fixes this issue.
// FailedAuthenticationStatus is emitted after ErrorAuthenticationStatus
// for lockout error is received
mLogger.d("onAuthenticationFailed called after"
+ " face has been locked out");
return;
}
handleFaceAuthFailed();
} else if (status instanceof HelpAuthenticationStatus) {
HelpAuthenticationStatus helpMsg = (HelpAuthenticationStatus) status;
@@ -1968,6 +1976,13 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
@Override
public void onAuthenticationFailed() {
if (isFaceLockedOut()) {
// TODO b/270090188: remove this hack when biometrics fixes this issue.
// onAuthenticationFailed is called after onAuthenticationError
// for lockout error is received
mLogger.d("onAuthenticationFailed called after face has been locked out");
return;
}
handleFaceAuthFailed();
}