commit 4ac5f85482de4f1845b21567ec510d79878552cd
author Julia Reynolds <juliacr@google.com> Mon Jun 23 17:38:51 2014 -0400
committer Julia Reynolds <juliacr@google.com> Mon Jun 23 17:48:21 2014 -0400
tree 2fa5616ba8ab9208b361533f75266d6ff2b8e0d5
parent 61606cec5ceb705910dec94222b22e66a0365094

If DISALLOW_REMOVE_USER is enabled, UserManager.removeUser should not remove users.

Bug: 15834711
Change-Id: I8048c971401fe3216a6e92aae1c961a3aee02dde

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..79c112a 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -1103,6 +1103,12 @@
      */
     public boolean removeUser(int userHandle) {
         checkManageUsersPermission("Only the system can remove users");
+        if (getUserRestrictions(UserHandle.getCallingUserId()).getBoolean(
+                UserManager.DISALLOW_REMOVE_USER, false)) {
+            Log.w(LOG_TAG, "Cannot remove user. DISALLOW_REMOVE_USER is enabled.");
+            return false;
+        }
+
         long ident = Binder.clearCallingIdentity();
         try {
             final UserInfo user;