Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev

2015-06-10 00:16:13 +00:00
parent 4766952273 b615799504
commit c2ae0090d2
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -589,6 +589,10 @@ public class UserManagerService extends IUserManager.Stub {
        if (ActivityManager.isLowRamDeviceStatic()) {
            return false;
        }
+        if (!mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_MANAGED_USERS)) {
+            return false;
+        }
        synchronized(mPackagesLock) {
            // Limit number of managed profiles that can be created
            if (numberOfUsersOfTypeLocked(UserInfo.FLAG_MANAGED_PROFILE, true)