Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "reset lockout deadline on device reboot" into mnc-dr-dev

Browse Source
This commit is contained in:
Andres Morales
2015-09-16 16:04:56 +00:00
committed by Android (Google) Code Review
parent 2b564bf42a a4e2337566
commit 38e6e4ef98
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@@ -1071,12 +1071,22 @@ public class LockPatternUtils {
* enter a pattern. * enter a pattern.
*/ */
public long getLockoutAttemptDeadline(int userId) { 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 timeoutMs = getLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, 0L, userId);
final long now = SystemClock.elapsedRealtime(); 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; return 0L;
} }
if (deadline > (now + timeoutMs)) {
// device was rebooted, set new deadline
deadline = now + timeoutMs;
setLong(LOCKOUT_ATTEMPT_DEADLINE, deadline, userId);
}
return deadline; return deadline;
} }