Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e21c1a8 authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

Merge "Add a hack that ensures face auth failed message is not shown after... 

Merge "Add a hack that ensures face auth failed message is not shown after face lockout" into udc-dev am: 963c0749 am: 4b6ba436

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



Change-Id: I9529e6173320dcf71adc6e50ab5837db17a6c2b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04bf9667 4b6ba436

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+15 −0
Original line number Diff line number Diff line
@@ -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();

                }