Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-qpr-dev

2024-12-03 19:51:15 +00:00
parent 30427fa945 a2f5c08370
commit ed4d949e5a
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -464,7 +464,8 @@ public class UserSettings extends SettingsPreferenceFragment
    @Override
    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
        int pos = 0;
-        if (!isCurrentUserAdmin() && canSwitchUserNow() && !isCurrentUserGuest()) {
+        if (!isCurrentUserAdmin() && canSwitchUserNow() && !isCurrentUserGuest()
+                && !mUserManager.isProfile()) {
            String nickname = mUserManager.getUserName();
            MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++,
                    getResources().getString(R.string.user_remove_user_menu, nickname));