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

Commit 85e28e31 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Dismiss keyguard when simpin auth'd and..." into udc-dev am: a9225e55 

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



Change-Id: I61609ae5559f984db40814e0c687861fded3fb80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e42e092 a9225e55

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

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                case SimPuk:

                    // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home

                    SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);

                    if (securityMode == SecurityMode.None && mLockPatternUtils.isLockScreenDisabled(

                    if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(

                            KeyguardUpdateMonitor.getCurrentUser())) {

                        finish = true;

                        eventSubtype = BOUNCER_DISMISS_SIM;

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

+39 −0
Original line number Diff line number Diff line
@@ -392,6 +392,45 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                .isEqualTo(SecurityMode.PIN);

    }



    @Test

    public void showNextSecurityScreenOrFinish_DeviceNotSecure() {

        // GIVEN the current security method is SimPin

        when(mKeyguardUpdateMonitor.getUserHasTrust(anyInt())).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserUnlockedWithBiometric(TARGET_USER_ID)).thenReturn(false);

        mKeyguardSecurityContainerController.showSecurityScreen(SecurityMode.SimPin);



        // WHEN a request is made from the SimPin screens to show the next security method

        when(mKeyguardSecurityModel.getSecurityMode(TARGET_USER_ID)).thenReturn(SecurityMode.None);

        mKeyguardSecurityContainerController.showNextSecurityScreenOrFinish(

                /* authenticated= */true,

                TARGET_USER_ID,

                /* bypassSecondaryLockScreen= */true,

                SecurityMode.SimPin);



        // THEN the next security method of None will dismiss keyguard.

        verify(mViewMediatorCallback).keyguardDone(anyBoolean(), anyInt());

    }



    @Test

    public void showNextSecurityScreenOrFinish_DeviceNotSecure_prevent_bypass_on() {

        when(mFeatureFlags.isEnabled(Flags.PREVENT_BYPASS_KEYGUARD)).thenReturn(true);

        // GIVEN the current security method is SimPin

        when(mKeyguardUpdateMonitor.getUserHasTrust(anyInt())).thenReturn(false);

        when(mKeyguardUpdateMonitor.getUserUnlockedWithBiometric(TARGET_USER_ID)).thenReturn(false);

        mKeyguardSecurityContainerController.showSecurityScreen(SecurityMode.SimPin);



        // WHEN a request is made from the SimPin screens to show the next security method

        when(mKeyguardSecurityModel.getSecurityMode(TARGET_USER_ID)).thenReturn(SecurityMode.None);

        mKeyguardSecurityContainerController.showNextSecurityScreenOrFinish(

                /* authenticated= */true,

                TARGET_USER_ID,

                /* bypassSecondaryLockScreen= */true,

                SecurityMode.SimPin);



        // THEN the next security method of None will dismiss keyguard.

        verify(mViewMediatorCallback).keyguardDone(anyBoolean(), anyInt());

    }



    @Test

    public void showNextSecurityScreenOrFinish_ignoresCallWhenSecurityMethodHasChanged() {

        //GIVEN current security mode has been set to PIN