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

Commit 9c966b81 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-qpr-dev

parents aeea04cd cc1a7bbc

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

+11 −3
Original line number Original line Diff line number Diff line
@@ -78,6 +78,7 @@ import com.android.systemui.plugins.ActivityStarter; 
import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.FalsingManager;

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

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

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

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.KeyguardStateController;

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

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

import com.android.systemui.util.ViewController;

import com.android.systemui.util.ViewController;
@@ -365,6 +366,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                }

                }

            };

            };





    private final DeviceProvisionedController mDeviceProvisionedController;



    @Inject

    @Inject

    public KeyguardSecurityContainerController(KeyguardSecurityContainer view,

    public KeyguardSecurityContainerController(KeyguardSecurityContainer view,

            AdminSecondaryLockScreenController.Factory adminSecondaryLockScreenControllerFactory,

            AdminSecondaryLockScreenController.Factory adminSecondaryLockScreenControllerFactory,
@@ -386,7 +389,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
            FalsingA11yDelegate falsingA11yDelegate,

            FalsingA11yDelegate falsingA11yDelegate,

            TelephonyManager telephonyManager,

            TelephonyManager telephonyManager,

            ViewMediatorCallback viewMediatorCallback,

            ViewMediatorCallback viewMediatorCallback,

            AudioManager audioManager

            AudioManager audioManager,

            DeviceProvisionedController deviceProvisionedController

    ) {

    ) {

        super(view);

        super(view);

        mLockPatternUtils = lockPatternUtils;

        mLockPatternUtils = lockPatternUtils;
@@ -411,6 +415,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        mTelephonyManager = telephonyManager;

        mTelephonyManager = telephonyManager;

        mViewMediatorCallback = viewMediatorCallback;

        mViewMediatorCallback = viewMediatorCallback;

        mAudioManager = audioManager;

        mAudioManager = audioManager;

        mDeviceProvisionedController = deviceProvisionedController;

    }

    }





    @Override

    @Override
@@ -752,8 +757,11 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                case SimPuk:

                case SimPuk:

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

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

                    SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);

                    SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);

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

                    boolean isLockscreenDisabled = mLockPatternUtils.isLockScreenDisabled(

                            KeyguardUpdateMonitor.getCurrentUser())) {

                            KeyguardUpdateMonitor.getCurrentUser())

                            || !mDeviceProvisionedController.isUserSetup(targetUserId);



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

                        finish = true;

                        finish = true;

                        eventSubtype = BOUNCER_DISMISS_SIM;

                        eventSubtype = BOUNCER_DISMISS_SIM;

                        uiEvent = BouncerUiEvent.BOUNCER_DISMISS_SIM;

                        uiEvent = BouncerUiEvent.BOUNCER_DISMISS_SIM;

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

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

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.FalsingManager;

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

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.KeyguardStateController;

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

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

import com.android.systemui.util.settings.GlobalSettings;

import com.android.systemui.util.settings.GlobalSettings;
@@ -207,7 +208,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                mConfigurationController, mFalsingCollector, mFalsingManager,

                mConfigurationController, mFalsingCollector, mFalsingManager,

                mUserSwitcherController, mFeatureFlags, mGlobalSettings,

                mUserSwitcherController, mFeatureFlags, mGlobalSettings,

                mSessionTracker, Optional.of(mSideFpsController), mFalsingA11yDelegate,

                mSessionTracker, Optional.of(mSideFpsController), mFalsingA11yDelegate,

                mTelephonyManager, mViewMediatorCallback, mAudioManager);

                mTelephonyManager, mViewMediatorCallback, mAudioManager,

                mock(DeviceProvisionedController.class));

    }

    }





    @Test

    @Test