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

Commit 758fa93f authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 448f1b18 

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



Change-Id: Iad19f26232aa66ded40e4cfe0c1282c5c7dabe78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf9f55f0 448f1b18

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

+9 −2
Original line number Original line Diff line number Diff line
@@ -81,6 +81,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;
@@ -363,6 +364,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                    showPrimarySecurityScreen(false);

                    showPrimarySecurityScreen(false);

                }

                }

            };

            };

    private final DeviceProvisionedController mDeviceProvisionedController;





    @Inject

    @Inject

    public KeyguardSecurityContainerController(KeyguardSecurityContainer view,

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

            FalsingCollector falsingCollector,

            FalsingManager falsingManager,

            FalsingManager falsingManager,

            UserSwitcherController userSwitcherController,

            UserSwitcherController userSwitcherController,

            DeviceProvisionedController deviceProvisionedController,

            FeatureFlags featureFlags,

            FeatureFlags featureFlags,

            GlobalSettings globalSettings,

            GlobalSettings globalSettings,

            SessionTracker sessionTracker,

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

        mViewMediatorCallback = viewMediatorCallback;

        mAudioManager = audioManager;

        mAudioManager = audioManager;

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;

        mDeviceProvisionedController = deviceProvisionedController;

    }

    }





    @Override

    @Override
@@ -766,8 +770,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

+2 −1
Original line number Original line Diff line number Diff line
@@ -73,6 +73,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;
@@ -216,7 +217,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger,

                mKeyguardUpdateMonitor, mKeyguardSecurityModel, mMetricsLogger, mUiEventLogger,

                mKeyguardStateController, mKeyguardSecurityViewFlipperController,

                mKeyguardStateController, mKeyguardSecurityViewFlipperController,

                mConfigurationController, mFalsingCollector, mFalsingManager,

                mConfigurationController, mFalsingCollector, mFalsingManager,

                mUserSwitcherController, mFeatureFlags, mGlobalSettings,

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

                mSessionTracker, Optional.of(mSideFpsController), mFalsingA11yDelegate,

                mSessionTracker, Optional.of(mSideFpsController), mFalsingA11yDelegate,

                mTelephonyManager, mViewMediatorCallback, mAudioManager,

                mTelephonyManager, mViewMediatorCallback, mAudioManager,

                mock(KeyguardFaceAuthInteractor.class),

                mock(KeyguardFaceAuthInteractor.class),