summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-10-11 13:30:10 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-11 13:30:10 -0700
commit1cd614c62c400091093a662cd331d268991f9e3f (patch)
treee655e14cd9e2db4e6db6c86376e949d92bdf750c
parent061a4de86d79d3ead3f297fa3fde4692446af5e4 (diff)
parentada86cba3c1eed749872401ddf676aaff85a8846 (diff)
downloadframeworks_base-1cd614c62c400091093a662cd331d268991f9e3f.zip
frameworks_base-1cd614c62c400091093a662cd331d268991f9e3f.tar.gz
frameworks_base-1cd614c62c400091093a662cd331d268991f9e3f.tar.bz2
Merge "Ignore dying users when testing for number of users on device. (Bug 7332248)" into jb-mr1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
index 32af5e3..8c390c8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -291,7 +291,7 @@ class QuickSettings {
mBar.collapseAllPanels(true);
final UserManager um =
(UserManager) mContext.getSystemService(Context.USER_SERVICE);
- if (um.getUsers().size() > 1) {
+ if (um.getUsers(true).size() > 1) {
try {
WindowManagerGlobal.getWindowManagerService().lockNow(
LockPatternUtils.USER_SWITCH_LOCK_OPTIONS);