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

Commit 7b81141c authored by Toni Barzic's avatar Toni Barzic Committed by android-build-merger
Browse files

Merge "Teach keyguard about PASSWORD_QUALITY_MANAGED" into nyc-dev am: 1c2db899 

am: a124a533

* commit 'a124a533':
  Teach keyguard about PASSWORD_QUALITY_MANAGED

Change-Id: I6ec95d745ef01d11af94a00d37bb41d0bebc5734
parents cc5bb55a a124a533

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

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

                || mode == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX

                || mode == DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC

                || mode == DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;

                || mode == DevicePolicyManager.PASSWORD_QUALITY_COMPLEX

                || mode == DevicePolicyManager.PASSWORD_QUALITY_MANAGED;

        return passwordEnabled && savedPasswordExists(userId);

    }

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

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

            case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:

            case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:

            case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:

                return SecurityMode.Password;



            case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: