Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into ics-mr0 (f13313a0) · Commits · e / os / android_frameworks_base

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();
		}