commit ea1d3ef6ce26e36128e32602f5ee4391e7c14e3c
author Julia Reynolds <juliacr@google.com> Thu Jul 17 09:59:28 2014 -0400
committer Julia Reynolds <juliacr@google.com> Thu Jul 17 09:59:28 2014 -0400
tree 757484f8382c52a346add982b55db8498fa78ff4
parent 5427b9a7990d408df1f2231ec649501f848f7d3d

Lockdown 'remove user' with user restriction in Settings for phones.

Bug: 16367204
Change-Id: I87a30412e89ecb2ae3e7d57edc347cd5b2d1e354

src/com/android/settings/users/UserDetailsSettings.java

diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index d342fad..bdfff7c 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -95,6 +95,9 @@
             mPhonePref.setChecked(
                     !mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_TELEPHONY));
         }
+        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER)) {
+            removePreference(KEY_REMOVE_USER);
+        }
         mPhonePref.setOnPreferenceChangeListener(this);
     }