Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscreen" into ics-mr0

Browse Source
This commit is contained in:
Jim Miller
2011-10-18 15:10:04 -07:00
committed by Android (Google) Code Review
parent 3f70aa783c 29aa5dc7de
commit f13313a073
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
View File

@@ -421,16 +421,20 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
Slog.i(TAG, "Too many unlock attempts; device will be wiped!"); Slog.i(TAG, "Too many unlock attempts; device will be wiped!");
showWipeDialog(failedAttempts); showWipeDialog(failedAttempts);
} }
} else if (usingPattern && mEnableFallback) {
if (failedAttempts == failedAttemptWarning) {
showAlmostAtAccountLoginDialog();
} else if (failedAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_RESET) {
mLockPatternUtils.setPermanentlyLocked(true);
updateScreen(mMode, false);
}
} else { } else {
final boolean showTimeout = boolean showTimeout =
(failedAttempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) == 0; (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;
}
}
if (showTimeout) { if (showTimeout) {
showTimeoutDialog(); showTimeoutDialog();
} }