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

Commit 16093fe3 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Revert "Disable fingerprint after force lock" 

Bug: 23827042
This reverts commit 0cb50efd.

Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
parent a4fca2c7

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

+6 −5
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ public class LockPatternUtils { 
     * @param userId either an explicit user id or {@link android.os.UserHandle#USER_ALL}

     */

    public void requireCredentialEntry(int userId) {

        requireStrongAuth(StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_REQUEST, userId);

        requireStrongAuth(StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST, userId);

    }



    /**
@@ -1251,7 +1251,7 @@ public class LockPatternUtils { 
                value = { STRONG_AUTH_NOT_REQUIRED,

                        STRONG_AUTH_REQUIRED_AFTER_BOOT,

                        STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW,

                        STRONG_AUTH_REQUIRED_AFTER_USER_REQUEST})

                        SOME_AUTH_REQUIRED_AFTER_USER_REQUEST})

        @Retention(RetentionPolicy.SOURCE)

        public @interface StrongAuthFlags {}
@@ -1266,14 +1266,14 @@ public class LockPatternUtils { 
        public static final int STRONG_AUTH_REQUIRED_AFTER_BOOT = 0x1;



        /**

         * Strong authentication is required because a device admin has temporarily requested it.

         * Strong authentication is required because a device admin has requested it.

         */

        public static final int STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW = 0x2;



        /**

         * Strong authentication is required because the user has temporarily requested it.

         * Some authentication is required because the user has temporarily disabled trust.

         */

        public static final int STRONG_AUTH_REQUIRED_AFTER_USER_REQUEST = 0x4;

        public static final int SOME_AUTH_REQUIRED_AFTER_USER_REQUEST = 0x4;



        /**

         * Strong authentication is required because the user has been locked out after too many
@@ -1289,6 +1289,7 @@ public class LockPatternUtils { 
        public static final int DEFAULT = STRONG_AUTH_REQUIRED_AFTER_BOOT;



        private static final int ALLOWING_FINGERPRINT = STRONG_AUTH_NOT_REQUIRED

                | SOME_AUTH_REQUIRED_AFTER_USER_REQUEST

                | SOME_AUTH_REQUIRED_AFTER_WRONG_CREDENTIAL;



        private final SparseIntArray mStrongAuthRequiredForUser = new SparseIntArray();

packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java

+2 −5
Original line number Diff line number Diff line
@@ -166,13 +166,10 @@ public class LockIcon extends KeyguardAffordanceView { 
        if (mAccessibilityController == null) {

            return;

        }

        boolean trustManagedOrFingerprintAllowed = mUnlockMethodCache.isTrustManaged()

                || KeyguardUpdateMonitor.getInstance(mContext).isUnlockingWithFingerprintAllowed();



        boolean clickToUnlock = mAccessibilityController.isTouchExplorationEnabled();

        boolean clickToForceLock = trustManagedOrFingerprintAllowed

        boolean clickToForceLock = mUnlockMethodCache.isTrustManaged()

                && !mAccessibilityController.isAccessibilityEnabled();

        boolean longClickToForceLock = trustManagedOrFingerprintAllowed

        boolean longClickToForceLock = mUnlockMethodCache.isTrustManaged()

                && !clickToForceLock;

        setClickable(clickToForceLock || clickToUnlock);

        setLongClickable(longClickToForceLock);