commit 75175025f8d727d9841308fa0afcb9a7a1a118cd
author Julia Reynolds <juliacr@google.com> Thu Jun 26 16:35:00 2014 -0400
committer Julia Reynolds <juliacr@google.com> Fri Jun 27 09:13:23 2014 -0400
tree b80ab3e422ec140604db46988535a0b21530e4ae
parent 5622e8b6698d1b63371bff37727e3d9f5fdf4e8e

If DISALLOW_ADD_USER is enabled, do not allow users to be created.

Bug: 15910634
Change-Id: I7e14bf7d71001f218402a5d90e2aadc54fcfd875

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 a0cb098..832a3b6 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -1047,6 +1047,11 @@
     }
 
     private UserInfo createUserInternal(String name, int flags, int parentId) {
+        if (getUserRestrictions(UserHandle.getCallingUserId()).getBoolean(
+                UserManager.DISALLOW_ADD_USER, false)) {
+            Log.w(LOG_TAG, "Cannot add user. DISALLOW_ADD_USER is enabled.");
+            return null;
+        }
         final long ident = Binder.clearCallingIdentity();
         UserInfo userInfo = null;
         try {