diff options
| author | Adam Bookatz <bookatz@google.com> | 2024-11-18 15:53:41 -0800 |
|---|---|---|
| committer | Julian Veit <claymore1298@gmail.com> | 2025-06-11 18:48:58 +0200 |
| commit | eb71d9d12f9242d4b7bd30f658b6695a2553882b (patch) | |
| tree | e46fa95453d69d81c68f5c332f37c398feeaa70e | |
| parent | f86d3e20277b8e7b1983822004173d818f7d86a9 (diff) | |
Don't let profiles open the UserSettings overflow [DO NOT MERGE]s12.1
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 69c7f5dac580361792bbb189178653b297d06c8a)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fa5ff372a068f287d28e9294a461dd266d17bd16)
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
| -rw-r--r-- | src/com/android/settings/users/UserSettings.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index ee23fc379d8..56bdfba3069 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -358,8 +358,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)); |