Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c44a165e authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

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

Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378 am: 12c10132

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



Change-Id: I3c6492ee12dc88b518079e167583b37435743d20
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eaeb26ad 12c10132

tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java

+0 −11
Original line number Diff line number Diff line
@@ -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);