commit baffc8892440bcdf43c90aa74e301bd3d16a795a
author Julia Reynolds <juliacr@google.com> Wed Jul 23 14:51:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 22 21:50:21 2014 +0000
tree c5e2860e0fd57e16a36aa61739427533ce37cc4e
parent 7ae20e3ce98543888cfccbef6b1254d060bc30ca
parent ea1d3ef6ce26e36128e32602f5ee4391e7c14e3c

Merge "Lockdown 'remove user' with user restriction in Settings for phones." into lmp-dev

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 fa559c3..8a070c2 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_OUTGOING_CALLS));
         }
+        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER)) {
+            removePreference(KEY_REMOVE_USER);
+        }
         mPhonePref.setOnPreferenceChangeListener(this);
     }