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

Commit f2ff8330 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 am: 170bedf6 

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



Change-Id: Icc015e35474e0924ec9e17eab29a0c455ba29392
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f14cf1af 170bedf6

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

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

                }

            };

    private final DeviceProvisionedController mDeviceProvisionedController;



    @Inject

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

            FalsingManager falsingManager,

            UserSwitcherController userSwitcherController,

            DeviceProvisionedController deviceProvisionedController,

            FeatureFlags featureFlags,

            GlobalSettings globalSettings,

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

        mAudioManager = audioManager;

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;

        mDeviceProvisionedController = deviceProvisionedController;

    }



    @Override
@@ -766,8 +770,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
@@ -73,6 +73,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;
@@ -216,7 +217,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),