Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03a528e6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Revert "Do not finish lockscreen for multiple sims."" into... 

Merge "Merge "Revert "Do not finish lockscreen for multiple sims."" into udc-qpr-dev am: dacf60fe" into udc-qpr-dev-plus-aosp am: 4226038d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24406387



Change-Id: Ia834902fce3363745b9b9cd66892402f30a8b23b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 835e8765 4226038d

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

+1 −2
Original line number Diff line number Diff line
@@ -848,8 +848,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;

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+0 −24
Original line number Diff line number Diff line
@@ -507,30 +507,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