diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index 91a5d3a0041ca..3c305f6e443e8 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -76,11 +76,6 @@ public class LockPatternUtils { private static final String TAG = "LockPatternUtils"; private static final boolean FRP_CREDENTIAL_ENABLED = true; - /** - * The key to identify when the lock pattern enabled flag is being accessed for legacy reasons. - */ - public static final String LEGACY_LOCK_PATTERN_ENABLED = "legacy_lock_pattern_enabled"; - /** * The interval of the countdown for showing progress of the lockout. */ @@ -952,19 +947,6 @@ public class LockPatternUtils { return type == CREDENTIAL_TYPE_PATTERN; } - @Deprecated - public boolean isLegacyLockPatternEnabled(int userId) { - // Note: this value should default to {@code true} to avoid any reset that might result. - // We must use a special key to read this value, since it will by default return the value - // based on the new logic. - return getBoolean(LEGACY_LOCK_PATTERN_ENABLED, true, userId); - } - - @Deprecated - public void setLegacyLockPatternEnabled(int userId) { - setBoolean(Settings.Secure.LOCK_PATTERN_ENABLED, true, userId); - } - /** * @return Whether the visible pattern is enabled. */ diff --git a/services/core/java/com/android/server/locksettings/LockSettingsStorage.java b/services/core/java/com/android/server/locksettings/LockSettingsStorage.java index 434c0d7f955ae..de3a7ef4ed61e 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsStorage.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsStorage.java @@ -533,11 +533,6 @@ class LockSettingsStorage { if (userId == USER_FRP) { return null; } - - if (LockPatternUtils.LEGACY_LOCK_PATTERN_ENABLED.equals(key)) { - key = Settings.Secure.LOCK_PATTERN_ENABLED; - } - return readKeyValue(key, defaultValue, userId); }