Merge "If DISALLOW_REMOVE_USER is enabled, UserManager.removeUser should not remove users." (37271629) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -1108,6 +1108,12 @@ public class UserManagerService extends IUserManager.Stub {
		*/
		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;