Add more policy transparency for disallow_remove_user restriction.

Bug: 27784015 Change-Id: I2386efbf521ee8e73326006e78b0146341745e2b
2016-03-22 17:24:07 -07:00
parent 2bfbcfae13
commit b5c92147ce
2 changed files with 12 additions and 4 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -970,7 +970,15 @@ public class UserSettings extends SettingsPreferenceFragment
            int userId = ((UserPreference) v.getTag()).getUserId();
            switch (v.getId()) {
            case UserPreference.DELETE_ID:
-                onRemoveUserClicked(userId);
+                final EnforcedAdmin removeDisallowedAdmin =
+                        RestrictedLockUtils.checkIfRestrictionEnforced(getContext(),
+                                UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
+                if (removeDisallowedAdmin != null) {
+                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+                            removeDisallowedAdmin);
+                } else {
+                    onRemoveUserClicked(userId);
+                }
                break;
            case UserPreference.SETTINGS_ID:
                onManageUserClicked(userId, false);