PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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'

Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5)
This commit is contained in:
Adam Bookatz
2024-11-18 15:53:41 -08:00
parent 93b2db6351
commit 6f1c499e57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/users/UserSettings.java
View File

@@ -358,8 +358,8 @@ public class UserSettings extends SettingsPreferenceFragment
int pos = 0; int pos = 0;
// TODO(b/191509236): The menu item does not need to be accessible for guest users, // TODO(b/191509236): The menu item does not need to be accessible for guest users,
// regardless of mGuestUserAutoCreated // regardless of mGuestUserAutoCreated
if (!mUserCaps.mIsAdmin && canSwitchUserNow() && !(isCurrentUserGuest() if (!mUserCaps.mIsAdmin && canSwitchUserNow() && !mUserManager.isProfile()
&& mGuestUserAutoCreated)) { && !(isCurrentUserGuest() && mGuestUserAutoCreated)) {
String nickname = mUserManager.getUserName(); String nickname = mUserManager.getUserName();
MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++, MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++,
getResources().getString(R.string.user_remove_user_menu, nickname)); getResources().getString(R.string.user_remove_user_menu, nickname));