diff options
| author | Jason Monk <jmonk@google.com> | 2014-08-07 16:02:03 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-08-11 10:22:43 -0400 |
| commit | 7c2739888abf93f7c84497643f0ca8e55c20c2ca (patch) | |
| tree | ae75f6af5422199d228a4fcd6942b422b5415929 /src | |
| parent | 802ddf99f57e316d0fd87c2cfeed5dc3a0cfa8fe (diff) | |
| download | packages_apps_Settings-7c2739888abf93f7c84497643f0ca8e55c20c2ca.zip packages_apps_Settings-7c2739888abf93f7c84497643f0ca8e55c20c2ca.tar.gz packages_apps_Settings-7c2739888abf93f7c84497643f0ca8e55c20c2ca.tar.bz2 | |
Don't allow creating guest when can't create user
When user restriction is on to disable adding user also stop the
user from creating guests.
Bug: 16782635
Change-Id: I0396172867e2e217ada9ef747ea62d0c0382c5dd
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 7dc83ef..30269cd 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -807,7 +807,19 @@ public class UserSettings extends SettingsPreferenceFragment mUserListCategory.addPreference(pref); } - if (!mIsGuest) { + boolean showGuestPreference = !mIsGuest; + // If user has DISALLOW_ADD_USER don't allow creating a guest either. + if (showGuestPreference && mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) { + showGuestPreference = false; + // If guest already exists, no user creation needed. + for (UserInfo user : users) { + if (user.isGuest()) { + showGuestPreference = true; + break; + } + } + } + if (showGuestPreference) { // Add a virtual Guest user for guest defaults Preference pref = new UserPreference(getActivity(), null, UserPreference.USERID_GUEST_DEFAULTS, @@ -936,6 +948,10 @@ public class UserSettings extends SettingsPreferenceFragment } } // No guest user. Create one. + if (mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) { + Log.i(TAG, "Blocking guest creation because it is restricted"); + return; + } UserInfo guestUser = mUserManager.createGuest(getActivity(), getResources().getString(R.string.user_guest)); if (guestUser != null) { |