diff options
author | Andres Morales <anmorales@google.com> | 2015-09-16 16:12:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 16:12:03 +0000 |
commit | 5b78fda91e33b4fc8de5f0a8ab894941202c42cb (patch) | |
tree | 2c16bae4122fedbcbe75dc36d6705e1ddc9e37bc /core/java/com | |
parent | e1ab0999cdcb719480200ea6be71a60f58ce90f4 (diff) | |
parent | 38e6e4ef98ea1f116902725c282df9fb061a224e (diff) | |
download | frameworks_base-5b78fda91e33b4fc8de5f0a8ab894941202c42cb.zip frameworks_base-5b78fda91e33b4fc8de5f0a8ab894941202c42cb.tar.gz frameworks_base-5b78fda91e33b4fc8de5f0a8ab894941202c42cb.tar.bz2 |
am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev
* commit '38e6e4ef98ea1f116902725c282df9fb061a224e':
reset lockout deadline on device reboot
Diffstat (limited to 'core/java/com')
-rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index a873ef8..82ae2f3 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -1071,12 +1071,22 @@ public class LockPatternUtils { * enter a pattern. */ public long getLockoutAttemptDeadline(int userId) { - final long deadline = getLong(LOCKOUT_ATTEMPT_DEADLINE, 0L, userId); + 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 || deadline > (now + timeoutMs)) { + if (deadline < now) { + // timeout expired + setLong(LOCKOUT_ATTEMPT_DEADLINE, 0, userId); + setLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, 0, userId); return 0L; } + + if (deadline > (now + timeoutMs)) { + // device was rebooted, set new deadline + deadline = now + timeoutMs; + setLong(LOCKOUT_ATTEMPT_DEADLINE, deadline, userId); + } + return deadline; } |