118 lines
5.7 KiB
Diff
118 lines
5.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Beverly <beverlyt@google.com>
|
|
Date: Thu, 18 Jan 2024 20:13:52 +0000
|
|
Subject: [PATCH] isUserInLockDown can be true when there are other strong auth
|
|
requirements
|
|
|
|
Bug: 315206668
|
|
Bug: 218495634
|
|
Flag: None
|
|
Test: manual, atest LockPatternUtilsTest
|
|
(cherry picked from commit d341f1ecdb011d24b17358f115391b3f997cb179)
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce7ca2d9f405c94062504411c886eff93bd7ce15)
|
|
Merged-In: I5e979a7822dd7254b4579ab28ecf96df1db44179
|
|
Change-Id: I5e979a7822dd7254b4579ab28ecf96df1db44179
|
|
---
|
|
.../internal/widget/LockPatternUtils.java | 4 +-
|
|
.../internal/util/LockPatternUtilsTest.java | 41 ++++++++++++++++---
|
|
2 files changed, 38 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
|
|
index e0a2803ea60b..d0e82ec29c80 100644
|
|
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
|
|
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
|
|
@@ -1484,8 +1484,8 @@ public class LockPatternUtils {
|
|
}
|
|
|
|
public boolean isUserInLockdown(int userId) {
|
|
- return getStrongAuthForUser(userId)
|
|
- == StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;
|
|
+ return (getStrongAuthForUser(userId)
|
|
+ & StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN) != 0;
|
|
}
|
|
|
|
private static class WrappedCallback extends ICheckCredentialProgressCallback.Stub {
|
|
diff --git a/core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java b/core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java
|
|
index 50e8474e8d52..01494a7659a5 100644
|
|
--- a/core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java
|
|
+++ b/core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java
|
|
@@ -19,6 +19,10 @@ package com.android.internal.util;
|
|
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_MANAGED;
|
|
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
|
|
|
|
+import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED;
|
|
+import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT;
|
|
+import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;
|
|
+
|
|
import static org.junit.Assert.assertFalse;
|
|
import static org.junit.Assert.assertTrue;
|
|
import static org.mockito.Mockito.doReturn;
|
|
@@ -48,12 +52,15 @@ import org.mockito.Mockito;
|
|
@SmallTest
|
|
public class LockPatternUtilsTest {
|
|
|
|
+ private ILockSettings mLockSettings;
|
|
+ private static final int USER_ID = 1;
|
|
private static final int DEMO_USER_ID = 5;
|
|
|
|
private LockPatternUtils mLockPatternUtils;
|
|
|
|
private void configureTest(boolean isSecure, boolean isDemoUser, int deviceDemoMode)
|
|
throws Exception {
|
|
+ mLockSettings = Mockito.mock(ILockSettings.class);
|
|
final Context context = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));
|
|
|
|
final MockContentResolver cr = new MockContentResolver(context);
|
|
@@ -61,15 +68,14 @@ public class LockPatternUtilsTest {
|
|
when(context.getContentResolver()).thenReturn(cr);
|
|
Settings.Global.putInt(cr, Settings.Global.DEVICE_DEMO_MODE, deviceDemoMode);
|
|
|
|
- final ILockSettings ils = Mockito.mock(ILockSettings.class);
|
|
- when(ils.getCredentialType(DEMO_USER_ID)).thenReturn(
|
|
+ when(mLockSettings.getCredentialType(DEMO_USER_ID)).thenReturn(
|
|
isSecure ? LockPatternUtils.CREDENTIAL_TYPE_PASSWORD
|
|
: LockPatternUtils.CREDENTIAL_TYPE_NONE);
|
|
- when(ils.getLong("lockscreen.password_type", PASSWORD_QUALITY_UNSPECIFIED, DEMO_USER_ID))
|
|
- .thenReturn((long) PASSWORD_QUALITY_MANAGED);
|
|
+ when(mLockSettings.getLong("lockscreen.password_type", PASSWORD_QUALITY_UNSPECIFIED,
|
|
+ DEMO_USER_ID)).thenReturn((long) PASSWORD_QUALITY_MANAGED);
|
|
// TODO(b/63758238): stop spying the class under test
|
|
mLockPatternUtils = spy(new LockPatternUtils(context));
|
|
- when(mLockPatternUtils.getLockSettings()).thenReturn(ils);
|
|
+ when(mLockPatternUtils.getLockSettings()).thenReturn(mLockSettings);
|
|
doReturn(true).when(mLockPatternUtils).hasSecureLockScreen();
|
|
|
|
final UserInfo userInfo = Mockito.mock(UserInfo.class);
|
|
@@ -79,6 +85,31 @@ public class LockPatternUtilsTest {
|
|
when(context.getSystemService(Context.USER_SERVICE)).thenReturn(um);
|
|
}
|
|
|
|
+ @Test
|
|
+ public void isUserInLockDown() throws Exception {
|
|
+ configureTest(true, false, 2);
|
|
+
|
|
+ // GIVEN strong auth not required
|
|
+ when(mLockSettings.getStrongAuthForUser(USER_ID)).thenReturn(STRONG_AUTH_NOT_REQUIRED);
|
|
+
|
|
+ // THEN user isn't in lockdown
|
|
+ assertFalse(mLockPatternUtils.isUserInLockdown(USER_ID));
|
|
+
|
|
+ // GIVEN lockdown
|
|
+ when(mLockSettings.getStrongAuthForUser(USER_ID)).thenReturn(
|
|
+ STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN);
|
|
+
|
|
+ // THEN user is in lockdown
|
|
+ assertTrue(mLockPatternUtils.isUserInLockdown(USER_ID));
|
|
+
|
|
+ // GIVEN lockdown and lockout
|
|
+ when(mLockSettings.getStrongAuthForUser(USER_ID)).thenReturn(
|
|
+ STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN | STRONG_AUTH_REQUIRED_AFTER_LOCKOUT);
|
|
+
|
|
+ // THEN user is in lockdown
|
|
+ assertTrue(mLockPatternUtils.isUserInLockdown(USER_ID));
|
|
+ }
|
|
+
|
|
@Test
|
|
public void isLockScreenDisabled_isDemoUser_true() throws Exception {
|
|
configureTest(false, true, 2);
|