diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-07-02 16:46:27 +0200 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-07-02 16:46:27 +0200 |
| commit | d0b698f074a8a251781b62346a791de48d39d2a4 (patch) | |
| tree | ffc829c263d1b36786cea8cbaede2e22cfee2679 /packages/SystemUI/src/com/android/systemui/keyguard | |
| parent | e65e310fc979fa708d7469d01e42188174e47cf8 (diff) | |
| download | frameworks_base-d0b698f074a8a251781b62346a791de48d39d2a4.zip frameworks_base-d0b698f074a8a251781b62346a791de48d39d2a4.tar.gz frameworks_base-d0b698f074a8a251781b62346a791de48d39d2a4.tar.bz2 | |
Fix "None" lock screen option
Now that we have a user switcher in quick settings, we don't need to
show the lockscreen if multi-user is enabled.
Bug: 15864584
Change-Id: I1a7ea69963fdd5a4f79584f565beff36612468f5
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
| -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 322174a..85f5888 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -881,8 +881,7 @@ public class KeyguardViewMediator extends SystemUI { return; } - if (!mUserManager.isUserSwitcherEnabled() - && mLockPatternUtils.isLockScreenDisabled() && !lockedOrMissing) { + if (mLockPatternUtils.isLockScreenDisabled() && !lockedOrMissing) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because lockscreen is off"); return; } |