diff options
| author | Fan Zhang <zhfan@google.com> | 2018-06-05 13:30:11 -0700 |
|---|---|---|
| committer | Fan Zhang <zhfan@google.com> | 2018-06-08 14:48:54 -0700 |
| commit | c69c8b60084b13fe5e4d6d299708b5ca248ecc36 (patch) | |
| tree | 020e89231ce0ddbf77a1a38f4c752b58589d4887 /core/java | |
| parent | 70b447a378d0233dfc76cf208e5959c6070f1ed0 (diff) | |
Add a setting to control multi-user feature on/off.
Bug: 72319180
Test: n/a
Change-Id: I0fd00e9c278de8ece530cacd43aaeae854002f14
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 6 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index bc3d87062c7f..7a214b1bf1bf 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -2667,6 +2667,12 @@ public class UserManager { if (isDeviceInDemoMode(mContext)) { return false; } + // If user disabled this feature, don't show switcher + final boolean userSwitcherEnabled = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.USER_SWITCHER_ENABLED, 1) != 0; + if (!userSwitcherEnabled) { + return false; + } List<UserInfo> users = getUsers(true); if (users == null) { return false; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9e5efa1fe2d0..34bb8867fdc2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9432,6 +9432,12 @@ public final class Settings { public static final String USE_GOOGLE_MAIL = "use_google_mail"; /** + * Whether or not switching/creating users is enabled by user. + * @hide + */ + public static final String USER_SWITCHER_ENABLED = "user_switcher_enabled"; + + /** * Webview Data reduction proxy key. * @hide */ |