diff options
| author | Adrian Roos <roosa@google.com> | 2015-09-03 22:06:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 22:06:08 +0000 |
| commit | c0c140a1368a08dca3a834d175ea1825d3fb567b (patch) | |
| tree | 0865251cbac3a412d7a60d7149b5270a386bd482 /core/java | |
| parent | 0e228726663bc579f0014a6c73cf63cb7142e56d (diff) | |
| parent | 5b92de04b7ff9954a50e54a86f11443a904fa547 (diff) | |
am 5b92de04: am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev
* commit '5b92de04b7ff9954a50e54a86f11443a904fa547':
Don't disable fingerprint when entering wrong credential
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 051845ff7970..d96a909fb039 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -232,7 +232,7 @@ public class LockPatternUtils { public void reportFailedPasswordAttempt(int userId) { getDevicePolicyManager().reportFailedPasswordAttempt(userId); getTrustManager().reportUnlockAttempt(false /* authenticated */, userId); - requireCredentialEntry(userId); + requireStrongAuth(StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_WRONG_CREDENTIAL, userId); } public void reportSuccessfulPasswordAttempt(int userId) { @@ -1290,10 +1290,17 @@ public class LockPatternUtils { */ public static final int STRONG_AUTH_REQUIRED_AFTER_LOCKOUT = 0x8; + /** + * Some authentication is required because the user has entered a wrong credential. + */ + public static final int SOME_AUTH_REQUIRED_AFTER_WRONG_CREDENTIAL = 0x10; + public static final int DEFAULT = STRONG_AUTH_REQUIRED_AFTER_BOOT; - final SparseIntArray mStrongAuthRequiredForUser = new SparseIntArray(); + private static final int ALLOWING_FINGERPRINT = STRONG_AUTH_NOT_REQUIRED + | SOME_AUTH_REQUIRED_AFTER_WRONG_CREDENTIAL; + private final SparseIntArray mStrongAuthRequiredForUser = new SparseIntArray(); private final H mHandler; public StrongAuthTracker() { @@ -1332,7 +1339,7 @@ public class LockPatternUtils { * current strong authentication requirements. */ public boolean isFingerprintAllowedForUser(int userId) { - return getStrongAuthForUser(userId) == STRONG_AUTH_NOT_REQUIRED; + return (getStrongAuthForUser(userId) & ~ALLOWING_FINGERPRINT) == 0; } /** |