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

Commit 4be31673 authored by Zhen Zhang's avatar Zhen Zhang Committed by Automerger Merge Worker
Browse files

Merge "Allow low ram device to have multiple users and managed profies" into... 

Merge "Allow low ram device to have multiple users and managed profies" into rvc-dev am: 2260f710 am: 934f9faf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11667418

Change-Id: I69d2315c7c5431b85c01f343839350d06ac2547e
parents 2bc46462 934f9faf

core/java/android/os/UserManager.java

+0 −7
Original line number Diff line number Diff line
@@ -4090,13 +4090,6 @@ public class UserManager { 
    public static int getMaxSupportedUsers() {

        // Don't allow multiple users on certain builds

        if (android.os.Build.ID.startsWith("JVP")) return 1;

        if (ActivityManager.isLowRamDeviceStatic()) {

            // Low-ram devices are Svelte. Most of the time they don't get multi-user.

            if ((Resources.getSystem().getConfiguration().uiMode & Configuration.UI_MODE_TYPE_MASK)

                    != Configuration.UI_MODE_TYPE_TELEVISION) {

                return 1;

            }

        }

        return SystemProperties.getInt("fw.max_users",

                Resources.getSystem().getInteger(R.integer.config_multiuserMaximumUsers));

    }

services/core/java/com/android/server/pm/UserManagerService.java

+0 −3
Original line number Diff line number Diff line
@@ -2250,9 +2250,6 @@ public class UserManagerService extends IUserManager.Stub { 
        // Managed profiles have their own specific rules.

        final boolean isManagedProfile = type.isManagedProfile();

        if (isManagedProfile) {

            if (ActivityManager.isLowRamDeviceStatic()) {

                return false;

            }

            if (!mContext.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_MANAGED_USERS)) {

                return false;