Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bede7587: am fe49af26: Merge "Temporarily disable multiuser for specific builds" into jb-mr1-dev

Browse Source 
* commit 'bede7587df180cc0a7335bac03e789249601db9a':
  Temporarily disable multiuser for specific builds
This commit is contained in:
Amith Yamasani
2012-10-12 13:17:43 -07:00
committed by Android Git Automerger
parent 2daca75ab1 bede7587df
commit 80ef0935cf
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/UserManager.java
View File

@@ -320,6 +320,8 @@ public class UserManager {
* @return a value greater than or equal to 1 * @return a value greater than or equal to 1
*/ */
public static int getMaxSupportedUsers() { 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", return SystemProperties.getInt("fw.max_users",
Resources.getSystem().getInteger(R.integer.config_multiuserMaximumUsers)); Resources.getSystem().getInteger(R.integer.config_multiuserMaximumUsers));
} }

3
policy/src/com/android/internal/policy/impl/GlobalActions.java
View File

@@ -314,7 +314,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
} }
// one more thing: optionally add a list of users to switch to // 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); addUsersToMenu(mItems);
} }