mirror of
https://github.com/yurisieucuti/treble_evolution.git
synced 2024-11-24 08:36:19 +00:00
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From aca6e1eace210e60fa9f4fc196d76629a61ac549 Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Hugues Husson <phh@phh.me>
|
|
Date: Sun, 5 Apr 2020 16:32:46 +0200
|
|
Subject: [PATCH 11/51] Always allow overriding the number of work profiles
|
|
|
|
Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a
|
|
---
|
|
.../java/com/android/server/pm/UserManagerService.java | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
|
|
index c48eccf2aac5..071d4a75ebcd 100644
|
|
--- a/services/core/java/com/android/server/pm/UserManagerService.java
|
|
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
|
|
@@ -7555,12 +7555,8 @@ public class UserManagerService extends IUserManager.Stub {
|
|
*/
|
|
private static int getMaxUsersOfTypePerParent(UserTypeDetails userTypeDetails) {
|
|
final int defaultMax = userTypeDetails.getMaxAllowedPerParent();
|
|
- if (!Build.IS_DEBUGGABLE) {
|
|
- return defaultMax;
|
|
- } else {
|
|
- if (userTypeDetails.isManagedProfile()) {
|
|
- return SystemProperties.getInt("persist.sys.max_profiles", defaultMax);
|
|
- }
|
|
+ if (userTypeDetails.isManagedProfile()) {
|
|
+ return SystemProperties.getInt("persist.sys.max_profiles", defaultMax);
|
|
}
|
|
return defaultMax;
|
|
}
|
|
--
|
|
2.25.1
|
|
|