diff options
3 files changed, 0 insertions, 23 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index dc28fa45794c..a1f8de41cfce 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -171,7 +171,6 @@ public class LockPatternUtils { */ public static final int USER_FRP = UserHandle.USER_NULL + 1; - public final static String PATTERN_EVER_CHOSEN_KEY = "lockscreen.patterneverchosen"; public final static String PASSWORD_TYPE_KEY = "lockscreen.password_type"; @Deprecated public final static String PASSWORD_TYPE_ALTERNATE_KEY = "lockscreen.password_type_alternate"; @@ -597,16 +596,6 @@ public class LockPatternUtils { } /** - * Return true if the user has ever chosen a pattern. This is true even if the pattern is - * currently cleared. - * - * @return True if the user has ever chosen a pattern. - */ - public boolean isPatternEverChosen(int userId) { - return getBoolean(PATTERN_EVER_CHOSEN_KEY, false, userId); - } - - /** * Returns the length of the PIN set by a particular user. * @param userId user id of the user whose pin length we have to return * @return @@ -639,13 +628,6 @@ public class LockPatternUtils { return false; } } - /** - * Records that the user has chosen a pattern at some time, even if the pattern is - * currently cleared. - */ - public void reportPatternWasChosen(int userId) { - setBoolean(PATTERN_EVER_CHOSEN_KEY, true, userId); - } /** * Used by device policy manager to validate the current password diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index b404465a8cce..b19d3495c217 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -961,7 +961,6 @@ public class SettingsBackupAgent extends BackupAgentHelper { lockPatternUtils.setOwnerInfo(value, userId); break; case KEY_LOCK_SETTINGS_VISIBLE_PATTERN_ENABLED: - lockPatternUtils.reportPatternWasChosen(userId); lockPatternUtils.setVisiblePatternEnabled("1".equals(value), userId); break; case KEY_LOCK_SETTINGS_POWER_BUTTON_INSTANTLY_LOCKS: diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index ff959decac33..8547c96e13af 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -1767,10 +1767,6 @@ public class LockSettingsService extends ILockSettings.Stub { } private void onPostPasswordChanged(LockscreenCredential newCredential, int userHandle) { - if (newCredential.isPattern()) { - setBoolean(LockPatternUtils.PATTERN_EVER_CHOSEN_KEY, true, userHandle); - } - updatePasswordHistory(newCredential, userHandle); mContext.getSystemService(TrustManager.class).reportEnabledTrustAgentsChanged(userHandle); } |