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'
Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
(cherry picked from commit 69c7f5dac5
)
This commit is contained in:
@@ -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));
|
||||
|
Reference in New Issue
Block a user