From a16f0854135516dbdfec3387bdda81c1b35fc1d0 Mon Sep 17 00:00:00 2001
From: Aaron Liu <aaronjli@google.com>
Date: Fri, 11 Aug 2023 17:39:17 +0000
Subject: [PATCH] Revert "Do not finish lockscreen for multiple sims."

This reverts commit 0f0a5bd651d6184ed6c45e1cd8069bb8f09559d1.

Reason for revert: automerge conflicts

Change-Id: I5b696f3cc7d364458630ba3510961caee6ef66d8
---
 .../KeyguardSecurityContainerController.java  |  3 +--
 ...KeyguardSecurityContainerControllerTest.kt | 24 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
index 8469335b371df..3b09910fbe88a 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
@@ -826,8 +826,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;
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt
index 3216836c9bbd7..e447c29b351f4 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt
@@ -483,30 +483,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