diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-06-13 01:14:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-12 05:34:42 +0000 |
| commit | 4118ac825a553b244fa1acb16b18bb52b7881abe (patch) | |
| tree | 33cf6fdf61830f407a4c43b751ea166576a0023a | |
| parent | 28b8434a007290fca6ea6a9f8daed779c2f8fb93 (diff) | |
| parent | a596ff87cd899640334512371456b8481ba21b4a (diff) | |
| download | frameworks_base-4118ac825a553b244fa1acb16b18bb52b7881abe.zip frameworks_base-4118ac825a553b244fa1acb16b18bb52b7881abe.tar.gz frameworks_base-4118ac825a553b244fa1acb16b18bb52b7881abe.tar.bz2 | |
Merge "Show user switcher if guest is enabled"
| -rw-r--r-- | core/java/android/os/UserManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ 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; } /** |