am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev

* commit '8e2c47870188c0732a1130b505748f07b23fa66c':
  Guest option should not be shown for the guest user
This commit is contained in:
Fyodor Kupolov
2015-06-09 23:06:14 +00:00
committed by Android Git Automerger

View File

@@ -773,7 +773,7 @@ public class UserSettings extends SettingsPreferenceFragment
userPreferences.add(pref);
}
if (mUserCaps.mCanAddGuest || findGuest() != null) {
if (!mUserCaps.mIsGuest && (mUserCaps.mCanAddGuest || findGuest() != null)) {
// Add a virtual Guest user for guest defaults
UserPreference pref = new UserPreference(getActivity(), null,
UserPreference.USERID_GUEST_DEFAULTS,