am 3de2d53a: am c25d5460: Merge "Fix jank: Don\'t write lockout deadline if not needed" into mnc-dr-dev

* commit '3de2d53a75ed66ee3e64412adfb77ff5a729b43a':
  Fix jank: Don't write lockout deadline if not needed
This commit is contained in:
Bill Rassieur
2015-09-28 23:15:24 +00:00
committed by Android Git Automerger

View File

@@ -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);