diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-09-15 15:27:19 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-09-15 17:46:10 -0700 |
| commit | 61d9409239c5ed360ffc2181eee6b981aad9192b (patch) | |
| tree | cc6a2fe8a61c9e8d131dd5384275c69566de3d21 /packages | |
| parent | 49c0e7375b237bc6eff8746ae91466ea6a660233 (diff) | |
| download | frameworks_base-61d9409239c5ed360ffc2181eee6b981aad9192b.zip frameworks_base-61d9409239c5ed360ffc2181eee6b981aad9192b.tar.gz frameworks_base-61d9409239c5ed360ffc2181eee6b981aad9192b.tar.bz2 | |
Show the lockscreen when more than 1 user is present
Bug:17399024
Change-Id: Iaf2ea2747cbcd9db45ba9faa7c8fe0389a799855
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 50ba68e..9af893d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -683,8 +683,7 @@ public class KeyguardViewMediator extends SystemUI { } private void maybeSendUserPresentBroadcast() { - if (mSystemReady && mLockPatternUtils.isLockScreenDisabled() - && !mUserManager.isUserSwitcherEnabled()) { + if (mSystemReady && mLockPatternUtils.isLockScreenDisabled()) { // Lock screen is disabled because the user has set the preference to "None". // In this case, send out ACTION_USER_PRESENT here instead of in // handleKeyguardDone() |