diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-12 13:13:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-12 13:13:25 -0700 |
| commit | fe49af266ea09bb83438c7694051bc950c5c7437 (patch) | |
| tree | 184cd8c1341f4b101d91c4d390f8a009a94930d2 | |
| parent | 3add43ab0e26c9fd44d4dea683092807229eaa59 (diff) | |
| parent | ff54920ed222a2bd6abe618743a5a3e9fe10bd4b (diff) | |
| download | frameworks_base-fe49af266ea09bb83438c7694051bc950c5c7437.zip frameworks_base-fe49af266ea09bb83438c7694051bc950c5c7437.tar.gz frameworks_base-fe49af266ea09bb83438c7694051bc950c5c7437.tar.bz2 | |
Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev
| -rw-r--r-- | core/java/android/os/UserManager.java | 2 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/GlobalActions.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 2739cac..898c766 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -320,6 +320,8 @@ public class UserManager { * @return a value greater than or equal to 1 */ public static int getMaxSupportedUsers() { + // Don't allow multiple users on certain builds + if (android.os.Build.ID.startsWith("JVP")) return 1; return SystemProperties.getInt("fw.max_users", Resources.getSystem().getInteger(R.integer.config_multiuserMaximumUsers)); } diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index 11b58bc..9ea47f9 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -314,7 +314,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac } // one more thing: optionally add a list of users to switch to - if (SystemProperties.getBoolean("fw.power_user_switcher", false)) { + // temporarily enable this by default + if (true || SystemProperties.getBoolean("fw.power_user_switcher", false)) { addUsersToMenu(mItems); } |