Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev

2015-09-28 23:02:46 +00:00
parent 86e153d5f0 e3e6d56b94
commit c25d546050
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -1074,7 +1074,7 @@ public class LockPatternUtils {
        long deadline = getLong(LOCKOUT_ATTEMPT_DEADLINE, 0L, userId);
        final long timeoutMs = getLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, 0L, userId);
        final long now = SystemClock.elapsedRealtime();
-        if (deadline < now) {
+        if (deadline < now && deadline != 0) {
            // timeout expired
            setLong(LOCKOUT_ATTEMPT_DEADLINE, 0, userId);
            setLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, 0, userId);