From 9aaf40d697bc2354072ad1ee23d0ef915b9cf1ac Mon Sep 17 00:00:00 2001
From: Konstantin Lopyrev <klopyrev@google.com>
Date: Thu, 13 May 2010 16:33:13 -0700
Subject: Fix 2593312: Screen does not get stuck in locked out mode.

Change-Id: Ib32db339a0d6b47119da94e56a14405c5ea63eb6
---
 src/com/android/settings/ConfirmLockPattern.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/com/android/settings/ConfirmLockPattern.java')

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);
         }
     }
 
-- 
cgit v1.1