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

Commit 6aa884d6 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
(cherry picked from commit da4c8f81)
parent 030ee2ca

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

+16 −5
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import com.android.systemui.R; 
import com.android.systemui.classifier.FalsingCollector;

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.util.ViewController;
@@ -221,6 +222,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                    mSecurityViewFlipperController.reloadColors();

                }

            };

    private final DeviceProvisionedController mDeviceProvisionedController;



    private KeyguardSecurityContainerController(KeyguardSecurityContainer view,

            AdminSecondaryLockScreenController.Factory adminSecondaryLockScreenControllerFactory,
@@ -233,7 +235,9 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            SecurityCallback securityCallback,

            KeyguardSecurityViewFlipperController securityViewFlipperController,

            ConfigurationController configurationController,

            FalsingCollector falsingCollector) {

            FalsingCollector falsingCollector,

            DeviceProvisionedController deviceProvisionedController

    ) {

        super(view);

        mLockPatternUtils = lockPatternUtils;

        mUpdateMonitor = keyguardUpdateMonitor;
@@ -248,6 +252,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        mConfigurationController = configurationController;

        mLastOrientation = getResources().getConfiguration().orientation;

        mFalsingCollector = falsingCollector;

        mDeviceProvisionedController = deviceProvisionedController;

    }



    @Override
@@ -426,8 +431,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;
@@ -626,6 +634,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        private final KeyguardSecurityViewFlipperController mSecurityViewFlipperController;

        private final ConfigurationController mConfigurationController;

        private final FalsingCollector mFalsingCollector;

       private final DeviceProvisionedController mDeviceProvisionedController;



        @Inject

        Factory(KeyguardSecurityContainer view,
@@ -639,7 +648,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                KeyguardStateController keyguardStateController,

                KeyguardSecurityViewFlipperController securityViewFlipperController,

                ConfigurationController configurationController,

                FalsingCollector falsingCollector) {

                FalsingCollector falsingCollector,

                DeviceProvisionedController deviceProvisionedController) {

            mView = view;

            mAdminSecondaryLockScreenControllerFactory = adminSecondaryLockScreenControllerFactory;

            mLockPatternUtils = lockPatternUtils;
@@ -651,6 +661,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            mSecurityViewFlipperController = securityViewFlipperController;

            mConfigurationController = configurationController;

            mFalsingCollector = falsingCollector;

            mDeviceProvisionedController = deviceProvisionedController;

        }



        public KeyguardSecurityContainerController create(
@@ -659,7 +670,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                    mAdminSecondaryLockScreenControllerFactory, mLockPatternUtils,

                    mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger,

                    mKeyguardStateController, securityCallback, mSecurityViewFlipperController,

                    mConfigurationController, mFalsingCollector);

                    mConfigurationController, mFalsingCollector, mDeviceProvisionedController);

        }



    }

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

+3 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.systemui.R; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.classifier.FalsingCollector;

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

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

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



import org.junit.Before;
@@ -143,8 +144,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                mView, mAdminSecondaryLockScreenControllerFactory, mLockPatternUtils,

                mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger,

                mKeyguardStateController, mKeyguardSecurityViewFlipperController,

                mConfigurationController, mFalsingCollector)

                .create(mSecurityCallback);

                mConfigurationController, mFalsingCollector,

                mock(DeviceProvisionedController.class)).create(mSecurityCallback);

    }



    @Test