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

Commit 1c2db899 authored by Toni Barzic's avatar Toni Barzic Committed by Android (Google) Code Review
Browse files

Merge "Teach keyguard about PASSWORD_QUALITY_MANAGED" into nyc-dev

parents f38aa6ba 79675b32

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1099,7 +1099,8 @@ public class LockPatternUtils { 
                || mode == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC

                || mode == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC

                || mode == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX

                || mode == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX

                || mode == DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC

                || mode == DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC

                || mode == DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;

                || mode == DevicePolicyManager.PASSWORD_QUALITY_COMPLEX

                || mode == DevicePolicyManager.PASSWORD_QUALITY_MANAGED;

        return passwordEnabled && savedPasswordExists(userId);

        return passwordEnabled && savedPasswordExists(userId);

    }

    }

packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,7 @@ public class KeyguardSecurityModel { 
            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:

            case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:

            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:

            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:

            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:

            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:

            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:

                return SecurityMode.Password;

                return SecurityMode.Password;





            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:

            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: