diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-16 17:11:20 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-04-28 11:49:00 -0700 |
| commit | 8150d2a2a12b38598fd55d8ae3c3b5662ec3520f (patch) | |
| tree | df0c100c35959c7317b8255865cdadf791364ec6 /packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java | |
| parent | c8240411c38b78ac8095f6e8067f7bcc7046f502 (diff) | |
| download | frameworks_base-8150d2a2a12b38598fd55d8ae3c3b5662ec3520f.zip frameworks_base-8150d2a2a12b38598fd55d8ae3c3b5662ec3520f.tar.gz frameworks_base-8150d2a2a12b38598fd55d8ae3c3b5662ec3520f.tar.bz2 | |
Require explicit userId in LockPatternUtils
Bug: 18931518
Change-Id: Ib03f37df9135f0324a998c62d165d8eea46328c8
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java index 322be91..db4db13 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java @@ -63,7 +63,8 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout // start fresh resetPasswordText(false /* animate */); // if the user is currently locked out, enforce it. - long deadline = mLockPatternUtils.getLockoutAttemptDeadline(); + long deadline = mLockPatternUtils.getLockoutAttemptDeadline( + mLockPatternUtils.getCurrentUser()); if (shouldLockout(deadline)) { handleAttemptLockout(deadline); } else { @@ -106,7 +107,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout protected void verifyPasswordAndUnlock() { String entry = getPasswordText(); - if (mLockPatternUtils.checkPassword(entry)) { + if (mLockPatternUtils.checkPassword(entry, mLockPatternUtils.getCurrentUser())) { mCallback.reportUnlockAttempt(true); mCallback.dismiss(true); } else { @@ -116,7 +117,8 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout mCallback.reportUnlockAttempt(false); int attempts = KeyguardUpdateMonitor.getInstance(mContext).getFailedUnlockAttempts(); if (0 == (attempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT)) { - long deadline = mLockPatternUtils.setLockoutAttemptDeadline(); + long deadline = mLockPatternUtils.setLockoutAttemptDeadline( + mLockPatternUtils.getCurrentUser()); handleAttemptLockout(deadline); } } |