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

Commit f7caea5b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove hack that was added in place of FaceManager fix" into... 

Merge "Remove hack that was added in place of FaceManager fix" into udc-qpr-dev am: 84c14218 am: 9ea8846c

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



Change-Id: I74f7686cd716a987d782f29f2264a2248d220ca5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13d1ffcd 9ea8846c

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

+0 −15
Original line number Diff line number Diff line
@@ -1461,14 +1461,6 @@ 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;
@@ -1977,13 +1969,6 @@ 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();

                }