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

Commit 448f1b18 authored by Aaron Liu's avatar Aaron Liu
Browse files

DO NOT MERGE Ensure finish lockscreen when usersetup incomplete 

Ensure that when the usersetup for the user is not complete, we do not
want to go to lockscreen, even if lockscreen is not disabled.

Bug: 222446076
Test: add Unit test,
Test: Wipe device, auth sim pin in setup, observe that lockscreen is
not there.

Change-Id: I8e33db8eb6e2c917966cab3d6a4f982670473040
Merged-In: I8e33db8eb6e2c917966cab3d6a4f982670473040
parent a07255e7

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

+9 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import com.android.systemui.plugins.ActivityStarter; 
import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.shared.system.SysUiStatsLog;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.util.ViewController;
@@ -362,6 +363,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                    showPrimarySecurityScreen(false);

                }

            };

    private final DeviceProvisionedController mDeviceProvisionedController;



    @Inject

    public KeyguardSecurityContainerController(KeyguardSecurityContainer view,
@@ -377,6 +379,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            FalsingCollector falsingCollector,

            FalsingManager falsingManager,

            UserSwitcherController userSwitcherController,

            DeviceProvisionedController deviceProvisionedController,

            FeatureFlags featureFlags,

            GlobalSettings globalSettings,

            SessionTracker sessionTracker,
@@ -411,6 +414,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        mViewMediatorCallback = viewMediatorCallback;

        mAudioManager = audioManager;

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;

        mDeviceProvisionedController = deviceProvisionedController;

    }



    @Override
@@ -763,8 +767,11 @@ 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(

                            KeyguardUpdateMonitor.getCurrentUser())) {

                    boolean isLockscreenDisabled = mLockPatternUtils.isLockScreenDisabled(

                            KeyguardUpdateMonitor.getCurrentUser())

                            || !mDeviceProvisionedController.isUserSetup(targetUserId);



                    if (securityMode == SecurityMode.None && isLockscreenDisabled) {

                        finish = true;

                        eventSubtype = BOUNCER_DISMISS_SIM;

                        uiEvent = BouncerUiEvent.BOUNCER_DISMISS_SIM;

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

+2 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.systemui.log.SessionTracker; 
import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.util.settings.GlobalSettings;
@@ -213,7 +214,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger,

                mKeyguardStateController, mKeyguardSecurityViewFlipperController,

                mConfigurationController, mFalsingCollector, mFalsingManager,

                mUserSwitcherController, mFeatureFlags, mGlobalSettings,

                mUserSwitcherController, mock(DeviceProvisionedController.class), mFeatureFlags, mGlobalSettings,

                mSessionTracker, Optional.of(mSideFpsController), mFalsingA11yDelegate,

                mTelephonyManager, mViewMediatorCallback, mAudioManager,

                mock(KeyguardFaceAuthInteractor.class));