Merge "Revert "Do not finish lockscreen for multiple sims."" into udc-qpr-dev (dacf60fe) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -840,8 +840,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
		boolean isLockscreenDisabled = mLockPatternUtils.isLockScreenDisabled(
		KeyguardUpdateMonitor.getCurrentUser());

		if (securityMode == SecurityMode.None) {
		if (securityMode == SecurityMode.None \|\| isLockscreenDisabled) {
		finish = isLockscreenDisabled;
		eventSubtype = BOUNCER_DISMISS_SIM;
		uiEvent = BouncerUiEvent.BOUNCER_DISMISS_SIM;

+0 −24

Original line number	Diff line number	Diff line
		@@ -499,30 +499,6 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() {
		verify(viewMediatorCallback, never()).keyguardDone(anyBoolean(), anyInt())
		}

		@Test
		fun showNextSecurityScreenOrFinish_SimPinToAnotherSimPin_None() {
		// GIVEN the current security method is SimPin
		whenever(keyguardUpdateMonitor.getUserHasTrust(anyInt())).thenReturn(false)
		whenever(keyguardUpdateMonitor.getUserUnlockedWithBiometric(TARGET_USER_ID))
		.thenReturn(false)
		underTest.showSecurityScreen(SecurityMode.SimPin)

		// WHEN a request is made from the SimPin screens to show the next security method
		whenever(keyguardSecurityModel.getSecurityMode(TARGET_USER_ID))
		.thenReturn(SecurityMode.SimPin)
		whenever(lockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(true)

		underTest.showNextSecurityScreenOrFinish(
		/* authenticated= */ true,
		TARGET_USER_ID,
		/* bypassSecondaryLockScreen= */ true,
		SecurityMode.SimPin
		)

		// THEN the next security method of None will dismiss keyguard.
		verify(viewMediatorCallback, never()).keyguardDone(anyBoolean(), anyInt())
		}

		@Test
		fun onSwipeUp_whenFaceDetectionIsNotRunning_initiatesFaceAuth() {
		val registeredSwipeListener = registeredSwipeListener