Update to follow device policy changes.

This commit is contained in:
Dianne Hackborn
2010-01-27 19:25:48 -08:00
parent 61daf83ca8
commit 8cecf89cec
3 changed files with 39 additions and 13 deletions

View File

@@ -224,7 +224,7 @@ public class SecuritySettings extends PreferenceActivity {
protected void handleUpdateUnlockMethod(final String value) {
if ("none".equals(value)) {
if (mDPM.getPasswordMode() == DevicePolicyManager.PASSWORD_MODE_UNSPECIFIED) {
if (mDPM.getPasswordMode(null) == DevicePolicyManager.PASSWORD_MODE_UNSPECIFIED) {
mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST);
}
} else {
@@ -236,7 +236,7 @@ public class SecuritySettings extends PreferenceActivity {
} else {
reqMode = LockPatternUtils.MODE_PATTERN;
}
int minMode = mDPM.getPasswordMode();
int minMode = mDPM.getPasswordMode(null);
if (reqMode < minMode) {
reqMode = minMode;
}