summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ConfirmLockPattern.java
diff options
context:
space:
mode:
authorKonstantin Lopyrev <klopyrev@google.com>2010-05-13 16:33:13 -0700
committerKonstantin Lopyrev <klopyrev@google.com>2010-05-13 16:36:03 -0700
commit9aaf40d697bc2354072ad1ee23d0ef915b9cf1ac (patch)
tree1c1c2960317bb8dde9a33c2633a23f296df78509 /src/com/android/settings/ConfirmLockPattern.java
parent28efa02104129832b36d251729109bb37c973dd2 (diff)
downloadpackages_apps_Settings-9aaf40d697bc2354072ad1ee23d0ef915b9cf1ac.zip
packages_apps_Settings-9aaf40d697bc2354072ad1ee23d0ef915b9cf1ac.tar.gz
packages_apps_Settings-9aaf40d697bc2354072ad1ee23d0ef915b9cf1ac.tar.bz2
Fix 2593312: Screen does not get stuck in locked out mode.
Change-Id: Ib32db339a0d6b47119da94e56a14405c5ea63eb6
Diffstat (limited to 'src/com/android/settings/ConfirmLockPattern.java')
-rw-r--r--src/com/android/settings/ConfirmLockPattern.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index eb9a4d8..8d44875 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -144,6 +144,11 @@ public class ConfirmLockPattern extends Activity {
long deadline = mLockPatternUtils.getLockoutAttemptDeadline();
if (deadline != 0) {
handleAttemptLockout(deadline);
+ } else if (!mLockPatternView.isEnabled()) {
+ // The deadline has passed, but the timer was cancelled...
+ // Need to clean up.
+ mNumWrongConfirmAttempts = 0;
+ updateStage(Stage.NeedToUnlock);
}
}