diff options
| author | Bill Rassieur <rassb@google.com> | 2015-09-28 23:02:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-28 23:02:46 +0000 |
| commit | c25d546050423845c42a5e8cc8e356caa1f4f71a (patch) | |
| tree | f9b5a8761dc45a4e5881a1c418458675674b95d2 | |
| parent | 86e153d5f0614c9f3da137fd0b815a398598928b (diff) | |
| parent | e3e6d56b94b2c196659e15deffed9dc9028fa974 (diff) | |
| download | frameworks_base-c25d546050423845c42a5e8cc8e356caa1f4f71a.zip frameworks_base-c25d546050423845c42a5e8cc8e356caa1f4f71a.tar.gz frameworks_base-c25d546050423845c42a5e8cc8e356caa1f4f71a.tar.bz2 | |
Merge "Fix jank: Don't write lockout deadline if not needed" into mnc-dr-dev
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 82ae2f3..60380fb 100644 --- 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); |