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

Commit 56de95d1 authored by Adam Bookatz's avatar Adam Bookatz Committed by Alexander Grund
Browse files

Don't let profiles open the UserSettings overflow [DO NOT MERGE] 

Really, profiles aren't expected to open Settings at all. But if they
do somehow, the overflow shouldn't appear.

Bug: 352542820
Flag: EXEMPT bugfix
Test: Try to access the overflow of the work profile by launching its Settings in
adb shell am start --user 10 'com.android.settings/.Settings\$UserSettingsActivity'

(cherry picked from commit 69c7f5da)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fa5ff372a068f287d28e9294a461dd266d17bd16)
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
parent e0cf48d6

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

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ public class UserSettings extends SettingsPreferenceFragment 
    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        int pos = 0;

        final boolean canSwitchUsers = mUserManager.canSwitchUsers();

        if (!mUserCaps.mIsAdmin && canSwitchUsers) {

        if (!mUserCaps.mIsAdmin && canSwitchUsers && !mUserManager.isProfile()) {

            String nickname = mUserManager.getUserName();

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

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