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

Commit 421c01d9 authored Jun 03, 2020 by Zhen Zhang Committed by Automerger Merge Worker Jun 03, 2020

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 am: 4be31673 am: a8c25b82

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

Change-Id: I77ac3913916fe59b5fa2b649b722270a13622d4e

parents 7a29fec4 a8c25b82

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
		@@ -2246,9 +2246,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;