diff options
| author | Adrian Roos <roosa@google.com> | 2015-01-08 16:20:00 +0100 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-01-09 14:35:52 +0100 |
| commit | 6b879f50f6a7452a14b311e20e4ed8d20e744613 (patch) | |
| tree | 38e3becb19587c310ee28be258938063f8322fa5 /src/com/android/settings/SecuritySettings.java | |
| parent | f788718f2142e5546bbf1b6847793d59ffea898b (diff) | |
| download | packages_apps_Settings-6b879f50f6a7452a14b311e20e4ed8d20e744613.zip packages_apps_Settings-6b879f50f6a7452a14b311e20e4ed8d20e744613.tar.gz packages_apps_Settings-6b879f50f6a7452a14b311e20e4ed8d20e744613.tar.bz2 | |
Remove usages of LPU.savedPatternExists
The correct method to call is isLockPatternEnabled, which
also checks whether we've actually selected a pattern.
Also removes the code for the obsolete pattern enabled setting.
Bug: 18931518
Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 7c45ada..a2824ea 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -72,7 +72,6 @@ public class SecuritySettings extends SettingsPreferenceFragment // Lock Settings private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change"; - private static final String KEY_LOCK_ENABLED = "lockenabled"; private static final String KEY_VISIBLE_PATTERN = "visiblepattern"; private static final String KEY_SECURITY_CATEGORY = "security_category"; private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category"; @@ -99,8 +98,8 @@ public class SecuritySettings extends SettingsPreferenceFragment // These switch preferences need special handling since they're not all stored in Settings. private static final String SWITCH_PREFERENCE_KEYS[] = { KEY_LOCK_AFTER_TIMEOUT, - KEY_LOCK_ENABLED, KEY_VISIBLE_PATTERN, - KEY_POWER_INSTANTLY_LOCKS, KEY_SHOW_PASSWORD, KEY_TOGGLE_INSTALL_APPLICATIONS }; + KEY_VISIBLE_PATTERN, KEY_POWER_INSTANTLY_LOCKS, KEY_SHOW_PASSWORD, + KEY_TOGGLE_INSTALL_APPLICATIONS }; // Only allow one trust agent on the platform. private static final boolean ONLY_ONE_TRUST_AGENT = true; @@ -610,8 +609,6 @@ public class SecuritySettings extends SettingsPreferenceFragment Log.e("SecuritySettings", "could not persist lockAfter timeout setting", e); } updateLockAfterPreferenceSummary(); - } else if (KEY_LOCK_ENABLED.equals(key)) { - lockPatternUtils.setLockPatternEnabled((Boolean) value); } else if (KEY_VISIBLE_PATTERN.equals(key)) { lockPatternUtils.setVisiblePatternEnabled((Boolean) value); } else if (KEY_POWER_INSTANTLY_LOCKS.equals(key)) { |