Merge "Guest option should not be shown for the guest user" into mnc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8e2c478701
@@ -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,
|
||||
|
Reference in New Issue
Block a user