Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88f8eaec authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211



Change-Id: Ide60dc82191b736ae1d1906d0b6ecd9808c7bc1e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f1943ce 31e69deb

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

+2 −2
Original line number Diff line number Diff line
@@ -380,8 +380,8 @@ public class UserSettings extends SettingsPreferenceFragment 
        int pos = 0;

        // TODO(b/191509236): The menu item does not need to be accessible for guest users,

        //  regardless of mGuestUserAutoCreated

        if (!mUserCaps.mIsAdmin && canSwitchUserNow() && !(isCurrentUserGuest()

                && mGuestUserAutoCreated)) {

        if (!mUserCaps.mIsAdmin && canSwitchUserNow() && !mUserManager.isProfile()

                && !(isCurrentUserGuest() && mGuestUserAutoCreated)) {

            String nickname = mUserManager.getUserName();

            MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++,

                    getResources().getString(R.string.user_remove_user_menu, nickname));