PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chad Brubaker
2015-05-12 21:16:17 +00:00
committed by Android (Google) Code Review
parent bdc4e534ba 95e6fe0e21
commit aeb09164cc
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -292,7 +292,6 @@ public class ChooseLockGeneric extends SettingsActivity {
/** increases the quality if necessary */ /** increases the quality if necessary */
private int upgradeQuality(int quality) { private int upgradeQuality(int quality) {
quality = upgradeQualityForDPM(quality); quality = upgradeQualityForDPM(quality);
quality = upgradeQualityForKeyStore(quality);
return quality; return quality;
} }
@@ -305,15 +304,6 @@ public class ChooseLockGeneric extends SettingsActivity {
return quality; 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 * Disables preferences that are less secure than required quality. The actual
* implementation is in disableUnusablePreferenceImpl. * implementation is in disableUnusablePreferenceImpl.