Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ef0935 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

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

* commit 'bede7587':
  Temporarily disable multiuser for specific builds
parents 2daca75a bede7587

core/java/android/os/UserManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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));

    }

policy/src/com/android/internal/policy/impl/GlobalActions.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }