diff options
| author | Emily Bernier <ember@google.com> | 2013-04-12 20:22:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-12 20:22:04 +0000 |
| commit | 91d40b7d972a0b5b8591c36f74f8aad38d82c796 (patch) | |
| tree | c0d8a0f600e8732d6c8eb6236f2f0c73a79b516c /src/com/android/settings/users | |
| parent | 35f02378710a0fd33bf62d2d10e0c655fe07d519 (diff) | |
| parent | 11bd33a564d4ae9a48195ad11dbbd09d80e59b55 (diff) | |
| download | packages_apps_Settings-91d40b7d972a0b5b8591c36f74f8aad38d82c796.zip packages_apps_Settings-91d40b7d972a0b5b8591c36f74f8aad38d82c796.tar.gz packages_apps_Settings-91d40b7d972a0b5b8591c36f74f8aad38d82c796.tar.bz2 | |
Merge "User restrictions for creds storage & user removal" into jb-mr2-dev
Diffstat (limited to 'src/com/android/settings/users')
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 1c557a2..a0e4c35 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -233,7 +233,8 @@ public class UserSettings extends SettingsPreferenceFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - if (!mIsOwner) { + UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); + if (!mIsOwner && !um.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER)) { String nickname = mUserManager.getUserName(); MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, 0, getResources().getString(R.string.user_remove_user_menu, nickname)); |