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

Fix 2535700: Add support for enforcing password quality

Browse Source 
Change-Id: I908b4229d46061f3d450adec72b04276fe10afc1
This commit is contained in:
Jim Miller
2010-03-25 18:45:22 -07:00
parent a6a74e222a
commit af366a3ed6
5 changed files with 74 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/android/settings/SecuritySettings.java
View File

@@ -162,13 +162,17 @@ public class SecuritySettings extends PreferenceActivity {
if (!mLockPatternUtils.isSecure()) {
addPreferencesFromResource(R.xml.security_settings_chooser);
} else {
final int currentMode = mLockPatternUtils.getPasswordMode();
if (currentMode == LockPatternUtils.MODE_PATTERN) {
addPreferencesFromResource(R.xml.security_settings_pattern);
} else if (currentMode == LockPatternUtils.MODE_PIN) {
addPreferencesFromResource(R.xml.security_settings_pin);
} else if (currentMode == LockPatternUtils.MODE_PASSWORD) {
addPreferencesFromResource(R.xml.security_settings_password);
switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
addPreferencesFromResource(R.xml.security_settings_pattern);
break;
case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
addPreferencesFromResource(R.xml.security_settings_pin);
break;
case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC:
case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC:
addPreferencesFromResource(R.xml.security_settings_password);
break;
}
}
@@ -243,12 +247,13 @@ public class SecuritySettings extends PreferenceActivity {
protected void handleUpdateUnlockMethod(String value) {
// NULL means update the current password/pattern/pin
if (value == null) {
int mode = mLockPatternUtils.getPasswordMode();
if (LockPatternUtils.MODE_PATTERN == mode) {
int mode = mLockPatternUtils.getKeyguardStoredPasswordQuality();
if (DevicePolicyManager.PASSWORD_QUALITY_SOMETHING == mode) {
value = "pattern";
} else if (LockPatternUtils.MODE_PASSWORD == mode) {
} else if (DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == mode
|| DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == mode) {
value = "password";
} else if (LockPatternUtils.MODE_PIN == mode) {
} else if (DevicePolicyManager.PASSWORD_QUALITY_NUMERIC == mode) {
value = "pin";
} else {
throw new IllegalStateException("Unknown password mode: " + value);
@@ -262,11 +267,11 @@ public class SecuritySettings extends PreferenceActivity {
} else {
int reqMode;
if ("password".equals(value)) {
reqMode = LockPatternUtils.MODE_PASSWORD;
reqMode = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
} else if ( "pin".equals(value)) {
reqMode = LockPatternUtils.MODE_PIN;
reqMode = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
} else {
reqMode = LockPatternUtils.MODE_PATTERN;
reqMode = DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
}
int minMode = mDPM.getPasswordQuality(null);
if (reqMode < minMode) {