summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-06-12 18:12:38 -0700
committerAmith Yamasani <yamasani@google.com>2014-06-12 18:13:09 -0700
commita596ff87cd899640334512371456b8481ba21b4a (patch)
treea60febf3357af5d97425dbc480c2c796bf2c236c
parent45c9ef2021e678b85851dce51fd9c2f3698eb0b3 (diff)
downloadframeworks_base-a596ff87cd899640334512371456b8481ba21b4a.zip
frameworks_base-a596ff87cd899640334512371456b8481ba21b4a.tar.gz
frameworks_base-a596ff87cd899640334512371456b8481ba21b4a.tar.bz2
Show user switcher if guest is enabled
even if there's only one user. Bug: 15549064 Change-Id: Ib9bc5e6cdc6f2655e44ec0a10a701dd39389e648
-rw-r--r--core/java/android/os/UserManager.java4
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;
}
/**