Merge "Show PIN screen with all PINs, not just simple ones" into lmp-dev

2014-08-25 18:53:27 +00:00
parent 177cd38b00 396ac76fd3
commit 4412e5c033
1 changed files with 3 additions and 1 deletions
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -767,7 +767,9 @@ public class LockPatternUtils {
                if (userHandle == UserHandle.USER_OWNER) {
                    // Update the encryption password.
                    int type = computedQuality == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC
-                        ? StorageManager.CRYPT_TYPE_PIN : StorageManager.CRYPT_TYPE_PASSWORD;
+                        || computedQuality == DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX
+                        ? StorageManager.CRYPT_TYPE_PIN
+                        : StorageManager.CRYPT_TYPE_PASSWORD;
                    updateEncryptionPassword(type, password);
                }