Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bd2f87e authored by Adrian Roos's avatar Adrian Roos Committed by Android Git Automerger
Browse files

am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering... 

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

* commit 'bd2ad550':
  Don't disable fingerprint when entering wrong credential
parents 95179ad4 bd2ad550

core/java/com/android/internal/widget/LockPatternUtils.java

+10 −3
Original line number Diff line number Diff line
@@ -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) {
@@ -1281,10 +1281,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() {
@@ -1323,7 +1330,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;

        }



        /**