commit a596ff87cd899640334512371456b8481ba21b4a
author Amith Yamasani <yamasani@google.com> Thu Jun 12 18:12:38 2014 -0700
committer Amith Yamasani <yamasani@google.com> Thu Jun 12 18:13:09 2014 -0700
tree a60febf3357af5d97425dbc480c2c796bf2c236c
parent 45c9ef2021e678b85851dce51fd9c2f3698eb0b3

Show user switcher if guest is enabled

even if there's only one user.

Bug: 15549064
Change-Id: Ib9bc5e6cdc6f2655e44ec0a10a701dd39389e648

core/java/android/os/UserManager.java

diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index eb3c748..468cfe0 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -882,7 +882,9 @@
                 ++switchableUserCount;
             }
         }
-        return switchableUserCount > 1;
+        final boolean guestEnabled = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.GUEST_USER_ENABLED, 0) == 1;
+        return switchableUserCount > 1 || guestEnabled;
     }
 
     /**