Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove dismiss check from security container" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-06-12 12:59:58 +00:00
committed by Android (Google) Code Review
parent 4360e144f4 d987fed12f
commit 27dcd8bbb8
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
View File

@@ -264,13 +264,6 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
*/
@Override
public void finish(boolean fromPrimaryAuth, int targetUserId) {
if (!mKeyguardStateController.canDismissLockScreen() && !fromPrimaryAuth) {
Log.e(TAG,
"Tried to dismiss keyguard when lockscreen is not dismissible and user "
+ "was not authenticated with a primary security method "
+ "(pin/password/pattern).");
return;
}
// If there's a pending runnable because the user interacted with a widget
// and we're leaving keyguard, then run it.
boolean deferKeyguardDone = false;

15
packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java
View File

@@ -584,21 +584,6 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
assertThat(mKeyguardSecurityContainerController.willRunDismissFromKeyguard()).isFalse();
}
@Test
public void testSecurityCallbackFinish() {
when(mKeyguardStateController.canDismissLockScreen()).thenReturn(true);
when(mKeyguardUpdateMonitor.isUserUnlocked(0)).thenReturn(true);
mKeyguardSecurityContainerController.finish(true, 0);
verify(mViewMediatorCallback).keyguardDone(anyBoolean(), anyInt());
}
@Test
public void testSecurityCallbackFinish_cannotDismissLockScreenAndNotStrongAuth() {
when(mKeyguardStateController.canDismissLockScreen()).thenReturn(false);
mKeyguardSecurityContainerController.finish(false, 0);
verify(mViewMediatorCallback, never()).keyguardDone(anyBoolean(), anyInt());
}
@Test
public void testOnStartingToHide() {
mKeyguardSecurityContainerController.onStartingToHide();