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

am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev

Browse Source 
* commit 'bd2ad550c5a7c7b7efbe3510f212322fb173b06c':
  Don't disable fingerprint when entering wrong credential
This commit is contained in:
Adrian Roos
2015-09-03 19:58:08 +00:00
committed by Android Git Automerger
parent 95179ad4be bd2ad550c5
commit 6bd2f87ee4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,7 @@ public class LockPatternUtils {
public void reportFailedPasswordAttempt(int userId) { public void reportFailedPasswordAttempt(int userId) {
getDevicePolicyManager().reportFailedPasswordAttempt(userId); getDevicePolicyManager().reportFailedPasswordAttempt(userId);
getTrustManager().reportUnlockAttempt(false /* authenticated */, userId); getTrustManager().reportUnlockAttempt(false /* authenticated */, userId);
requireCredentialEntry(userId); requireStrongAuth(StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_WRONG_CREDENTIAL, userId);
} }
public void reportSuccessfulPasswordAttempt(int userId) { public void reportSuccessfulPasswordAttempt(int userId) {
@@ -1281,10 +1281,17 @@ public class LockPatternUtils {
*/ */
public static final int STRONG_AUTH_REQUIRED_AFTER_LOCKOUT = 0x8; 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; 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; private final H mHandler;
public StrongAuthTracker() { public StrongAuthTracker() {
@@ -1323,7 +1330,7 @@ public class LockPatternUtils {
* current strong authentication requirements. * current strong authentication requirements.
*/ */
public boolean isFingerprintAllowedForUser(int userId) { public boolean isFingerprintAllowedForUser(int userId) {
return getStrongAuthForUser(userId) == STRONG_AUTH_NOT_REQUIRED; return (getStrongAuthForUser(userId) & ~ALLOWING_FINGERPRINT) == 0;
} }
/** /**