summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SecuritySettings.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-01-27 19:25:48 -0800
committerDianne Hackborn <hackbod@google.com>2010-01-28 11:03:09 -0800
commit8cecf89cec3ea14003482c046eec7d2aba8bb0ad (patch)
treecd78065de87654bfe7336337bf0ce61a88b4404a /src/com/android/settings/SecuritySettings.java
parent61daf83ca8bcf1353e0e81316a2b3809ec7397c5 (diff)
downloadpackages_apps_settings-8cecf89cec3ea14003482c046eec7d2aba8bb0ad.zip
packages_apps_settings-8cecf89cec3ea14003482c046eec7d2aba8bb0ad.tar.gz
packages_apps_settings-8cecf89cec3ea14003482c046eec7d2aba8bb0ad.tar.bz2
Update to follow device policy changes.
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
-rw-r--r--src/com/android/settings/SecuritySettings.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 5c44f27..78100fb 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -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;
}