commit aeb09164cc81432da04078c253a2adbe8dd51d3d
author Chad Brubaker <cbrubaker@google.com> Tue May 12 21:16:17 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 12 21:16:18 2015 +0000
tree 9226deefc8f77729d00fd700110a8886530016a3
parent bdc4e534ba2bbd5bc04f1046e5199251d54a9599
parent 95e6fe0e217d69316e4a2de0c7a5caa13640b4cb

Merge "No longer upgrade password quality based on keystore" into mnc-dev

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 7aa1053..317d372 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -292,7 +292,6 @@
         /** increases the quality if necessary */
         private int upgradeQuality(int quality) {
             quality = upgradeQualityForDPM(quality);
-            quality = upgradeQualityForKeyStore(quality);
             return quality;
         }
 
@@ -305,15 +304,6 @@
             return quality;
         }
 
-        private int upgradeQualityForKeyStore(int quality) {
-            if (!mKeyStore.isEmpty()) {
-                if (quality < CredentialStorage.MIN_PASSWORD_QUALITY) {
-                    quality = CredentialStorage.MIN_PASSWORD_QUALITY;
-                }
-            }
-            return quality;
-        }
-
         /***
          * Disables preferences that are less secure than required quality. The actual
          * implementation is in disableUnusablePreferenceImpl.