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

* commit 'bf25b219ab50e658bf90dc6e88b41c0c7e05e4c2':
  Guest option should not be shown for the guest user
This commit is contained in:
Fyodor Kupolov
2015-06-09 23:33:40 +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,