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

Commit 29aa5dc7 authored by Jim Miller's avatar Jim Miller
Browse files

Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen 

This fixes a bug where we were no longer showing the countdown dialog
every 5 attempts or "forgot pattern" button when the user has a fallback
password enabled on the pattern unlock screen.

It now correctly shows the dialog whenever the user hits a multiple of
5 bad attempts on any of the pin/pattern/password screens.

Change-Id: I4eb47b4149958a93572d256a4a70f9d67bc1eb38
parent f129988a

policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java

+12 −8
Original line number Diff line number Diff line
@@ -421,16 +421,20 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler 
                        Slog.i(TAG, "Too many unlock attempts; device will be wiped!");

                        showWipeDialog(failedAttempts);

                    }

                } else if (usingPattern && mEnableFallback) {

                } else {

                    boolean showTimeout =

                        (failedAttempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) == 0;

                    if (usingPattern && mEnableFallback) {

                        if (failedAttempts == failedAttemptWarning) {

                            showAlmostAtAccountLoginDialog();

                            showTimeout = false; // don't show both dialogs

                        } else if (failedAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_RESET) {

                            mLockPatternUtils.setPermanentlyLocked(true);

                            updateScreen(mMode, false);

                            // don't show timeout dialog because we show account unlock screen next

                            showTimeout = false;

                        }

                    }

                } else {

                    final boolean showTimeout =

                        (failedAttempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) == 0;

                    if (showTimeout) {

                        showTimeoutDialog();

                    }