Merge "Don't allow creating guest when can't create user" into lmp-dev (918c23bd) · Commits · e / os / android_packages_apps_Settings

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

+17 −1

Original line number	Diff line number	Diff line
		@@ -803,7 +803,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,
		@@ -930,6 +942,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) {