PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't allow creating guest when can't create user" into lmp-dev

Browse Source
This commit is contained in:
Jason Monk
2014-08-11 17:13:47 +00:00
committed by Android (Google) Code Review
parent f09fd458c4 7c2739888a
commit 918c23bd5f
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/users/UserSettings.java
View File

@@ -803,7 +803,19 @@ public class UserSettings extends SettingsPreferenceFragment
mUserListCategory.addPreference(pref); 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 // Add a virtual Guest user for guest defaults
Preference pref = new UserPreference(getActivity(), null, Preference pref = new UserPreference(getActivity(), null,
UserPreference.USERID_GUEST_DEFAULTS, UserPreference.USERID_GUEST_DEFAULTS,
@@ -930,6 +942,10 @@ public class UserSettings extends SettingsPreferenceFragment
} }
} }
// No guest user. Create one. // 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(), UserInfo guestUser = mUserManager.createGuest(getActivity(),
getResources().getString(R.string.user_guest)); getResources().getString(R.string.user_guest));
if (guestUser != null) { if (guestUser != null) {