No longer upgrade password quality based on keystore

Keystore no longer requires a password to operate and only deletes
encrypted at rest entries when the user removes their password, so
blocking password downgrade is no longer required.

Bug: 20764363
Change-Id: I6f06acc71a4165282985082203ae1194491844c7
This commit is contained in:
Chad Brubaker
2015-05-08 12:37:46 -07:00
parent ce57d16862
commit 95e6fe0e21

View File

@@ -292,7 +292,6 @@ public class ChooseLockGeneric extends SettingsActivity {
/** increases the quality if necessary */
private int upgradeQuality(int quality) {
quality = upgradeQualityForDPM(quality);
quality = upgradeQualityForKeyStore(quality);
return quality;
}
@@ -305,15 +304,6 @@ public class ChooseLockGeneric extends SettingsActivity {
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.