From 95e6fe0e217d69316e4a2de0c7a5caa13640b4cb Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Fri, 8 May 2015 12:37:46 -0700 Subject: [PATCH] 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 --- src/com/android/settings/ChooseLockGeneric.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 7aa10534e85..317d372c8e5 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -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.