Merge "Show user switcher if guest is enabled"

2014-06-13 01:14:27 +00:00
parent 28b8434a00 a596ff87cd
commit 4118ac825a
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -882,7 +882,9 @@ public class UserManager {
                ++switchableUserCount;
            }
        }
-        return switchableUserCount > 1;
+        final boolean guestEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.GUEST_USER_ENABLED, 0) == 1;
+        return switchableUserCount > 1 || guestEnabled;
    }

    /**