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

Commit 43120734 authored by Jim Miller's avatar Jim Miller
Browse files

Default to PASSWORD_QUALITY_UNSPECIFIED 

This changes methods in LockPatternUtils to default to PASSWORD_QUALITY_UNSPECIFIED
instead of PASSWORD_QUALITY_SOMETHING.  This was confusing device encryption tools on a
freshly installed device that has never had a PIN, pattern or password set up.

Change-Id: If9b62a71220ed7520b6730201e55e34e89c0357d
parent 7bc016e8

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

+7 −6
Original line number Diff line number Diff line
@@ -788,13 +788,13 @@ public class LockPatternUtils { 
     */

    public int getKeyguardStoredPasswordQuality() {

        int quality =

                (int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);

                (int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);

        // If the user has chosen to use weak biometric sensor, then return the backup locking

        // method and treat biometric as a special case.

        if (quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK) {

            quality =

                (int) getLong(PASSWORD_TYPE_ALTERNATE_KEY,

                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);

                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);

        }

        return quality;

    }
@@ -804,7 +804,7 @@ public class LockPatternUtils { 
     */

    public boolean usingBiometricWeak() {

        int quality =

                (int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);

                (int) getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);

        return quality == DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK;

    }
@@ -943,11 +943,12 @@ public class LockPatternUtils { 
     */

    public boolean isLockPatternEnabled() {

        final boolean backupEnabled =

                getLong(PASSWORD_TYPE_ALTERNATE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING)

                getLong(PASSWORD_TYPE_ALTERNATE_KEY,

                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)

                                == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;



        return getBoolean(Settings.Secure.LOCK_PATTERN_ENABLED, false)

                && (getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING)

                && (getLong(PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)

                        == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING ||

                        (usingBiometricWeak() && backupEnabled));

    }