Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713

Change-Id: Ib504b453a8caac0789084affcaa70a33e8b554d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-10-10 20:11:52 +00:00
committed by Automerger Merge Worker

View File

@@ -46,7 +46,6 @@ public class ShadowLockPatternUtils {
private static Map<Integer, PasswordMetrics> sUserToMetricsMap = new HashMap<>();
private static Map<Integer, PasswordMetrics> sUserToProfileMetricsMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToIsSecureMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToPatternEverChosenMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToVisiblePatternEnabledMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToBiometricAllowedMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToLockPatternEnabledMap = new HashMap<>();
@@ -61,7 +60,6 @@ public class ShadowLockPatternUtils {
sUserToMetricsMap.clear();
sUserToProfileMetricsMap.clear();
sUserToIsSecureMap.clear();
sUserToPatternEverChosenMap.clear();
sUserToVisiblePatternEnabledMap.clear();
sUserToBiometricAllowedMap.clear();
sUserToLockPatternEnabledMap.clear();
@@ -161,15 +159,6 @@ public class ShadowLockPatternUtils {
sUserToVisiblePatternEnabledMap.put(userId, isVisiblePatternEnabled);
}
@Implementation
public boolean isPatternEverChosen(int userId) {
return sUserToPatternEverChosenMap.getOrDefault(userId, true);
}
public static void setIsPatternEverChosen(int userId, boolean isPatternEverChosen) {
sUserToPatternEverChosenMap.put(userId, isPatternEverChosen);
}
@Implementation
public boolean isBiometricAllowedForUser(int userId) {
return sUserToBiometricAllowedMap.getOrDefault(userId, false);