Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713 Change-Id: I3c6492ee12dc88b518079e167583b37435743d20 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -46,7 +46,6 @@ public class ShadowLockPatternUtils {
|
|||||||
private static Map<Integer, PasswordMetrics> sUserToMetricsMap = new HashMap<>();
|
private static Map<Integer, PasswordMetrics> sUserToMetricsMap = new HashMap<>();
|
||||||
private static Map<Integer, PasswordMetrics> sUserToProfileMetricsMap = new HashMap<>();
|
private static Map<Integer, PasswordMetrics> sUserToProfileMetricsMap = new HashMap<>();
|
||||||
private static Map<Integer, Boolean> sUserToIsSecureMap = 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> sUserToVisiblePatternEnabledMap = new HashMap<>();
|
||||||
private static Map<Integer, Boolean> sUserToBiometricAllowedMap = new HashMap<>();
|
private static Map<Integer, Boolean> sUserToBiometricAllowedMap = new HashMap<>();
|
||||||
private static Map<Integer, Boolean> sUserToLockPatternEnabledMap = new HashMap<>();
|
private static Map<Integer, Boolean> sUserToLockPatternEnabledMap = new HashMap<>();
|
||||||
@@ -61,7 +60,6 @@ public class ShadowLockPatternUtils {
|
|||||||
sUserToMetricsMap.clear();
|
sUserToMetricsMap.clear();
|
||||||
sUserToProfileMetricsMap.clear();
|
sUserToProfileMetricsMap.clear();
|
||||||
sUserToIsSecureMap.clear();
|
sUserToIsSecureMap.clear();
|
||||||
sUserToPatternEverChosenMap.clear();
|
|
||||||
sUserToVisiblePatternEnabledMap.clear();
|
sUserToVisiblePatternEnabledMap.clear();
|
||||||
sUserToBiometricAllowedMap.clear();
|
sUserToBiometricAllowedMap.clear();
|
||||||
sUserToLockPatternEnabledMap.clear();
|
sUserToLockPatternEnabledMap.clear();
|
||||||
@@ -161,15 +159,6 @@ public class ShadowLockPatternUtils {
|
|||||||
sUserToVisiblePatternEnabledMap.put(userId, isVisiblePatternEnabled);
|
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
|
@Implementation
|
||||||
public boolean isBiometricAllowedForUser(int userId) {
|
public boolean isBiometricAllowedForUser(int userId) {
|
||||||
return sUserToBiometricAllowedMap.getOrDefault(userId, false);
|
return sUserToBiometricAllowedMap.getOrDefault(userId, false);
|
||||||
|
Reference in New Issue
Block a user