From 79675b326c5d5f49af1e2314b3d6b1466c857fe2 Mon Sep 17 00:00:00 2001 From: Toni Barzic Date: Tue, 29 Mar 2016 18:31:49 -0700 Subject: [PATCH] Teach keyguard about PASSWORD_QUALITY_MANAGED PASSWORD_QUALITY_MANAGED should have password security mode, rather than None. BUG=27923581 Change-Id: I6b2aeee0a79a37a868d7d30117c77f73495892ad --- core/java/com/android/internal/widget/LockPatternUtils.java | 3 ++- .../src/com/android/keyguard/KeyguardSecurityModel.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 9d1447836b93d..3d892afbb5f3f 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -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); } diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java index 454221a6cf42b..2b549f1a7fac9 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java @@ -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: