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

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