Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aaron Liu
2023-08-21 16:33:02 +00:00
committed by Android (Google) Code Review
parent ab6927cf18 448f1b18a7
commit 12ba8d5011
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
View File

@@ -80,6 +80,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;
@@ -362,6 +363,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,
@@ -377,6 +379,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,
@@ -411,6 +414,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
mViewMediatorCallback = viewMediatorCallback; mViewMediatorCallback = viewMediatorCallback;
mAudioManager = audioManager; mAudioManager = audioManager;
mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor; mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;
mDeviceProvisionedController = deviceProvisionedController;
} }
@Override @Override
@@ -763,8 +767,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;

3
packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java
View File

@@ -72,6 +72,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;
@@ -213,7 +214,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));