From 3a11c3b0de27a3166f72b0ff3627342c00136836 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 3 May 2023 00:33:53 +0000 Subject: [PATCH] ShadowLockPatternUtils: remove patternEverChosen methods These methods are being removed from LockPatternUtils because they are no longer used, so remove them from ShadowLockPatternUtils too. Bug: 270013005 Change-Id: If196bbef4755c644b3188043ed47e99817bf1856 Merged-In: If196bbef4755c644b3188043ed47e99817bf1856 (cherry picked from commit 795a02c92a9f3293059cdaf585eaa2c62e1078ff) --- .../testutils/shadow/ShadowLockPatternUtils.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java index f24b2957724..9afcd37e08f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java @@ -46,7 +46,6 @@ public class ShadowLockPatternUtils { private static Map sUserToMetricsMap = new HashMap<>(); private static Map sUserToProfileMetricsMap = new HashMap<>(); private static Map sUserToIsSecureMap = new HashMap<>(); - private static Map sUserToPatternEverChosenMap = new HashMap<>(); private static Map sUserToVisiblePatternEnabledMap = new HashMap<>(); private static Map sUserToBiometricAllowedMap = new HashMap<>(); private static Map 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);