commit b61579950461fca161e570f079f1f4d09389c49f
author Fyodor Kupolov <fkupolov@google.com> Fri Jun 05 15:32:28 2015 -0700
committer Fyodor Kupolov <fkupolov@google.com> Tue Jun 09 16:51:13 2015 -0700
tree f6110c94ae434c86fd6840c5a15b89d79b64f26d
parent 03123839e46f329018bb6216070abe62fd2b7175

Do not create profile if FEATURE_MANAGED_USERS is not available

Bug: 21629701
Change-Id: Ia0f720eee0faa0d565701064a268948f6dea82e4

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

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 08d386b..095b7d7 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -589,6 +589,10 @@
         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)