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

Commit c68bab01 authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 8e981df7: am 1cd614c6: Merge "Ignore dying users when testing for number of... 

am 8e981df7: am 1cd614c6: Merge "Ignore dying users when testing for number of users on device. (Bug 7332248)" into jb-mr1-dev

* commit '8e981df7':
  Ignore dying users when testing for number of users on device. (Bug 7332248)
parents f66bf0e8 8e981df7

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -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);