| commit | efb8f8401b74acfc766e3f20580c77d3374fd4d1 | [log] [tgz] |
|---|---|---|
| author | Adam Bookatz <bookatz@google.com> | Mon Nov 18 15:53:41 2024 -0800 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Dec 18 08:26:53 2024 -0800 |
| tree | b13f5051756fb960b0b5e1fb42636d3f784e3cb1 | |
| parent | 046a18c9ae5fc30cd44f48c8c195583b310f896d [diff] |
Don't let profiles open the UserSettings overflow 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 https://googleplex-android-review.googlesource.com/q/commit:69c7f5dac580361792bbb189178653b297d06c8a) Merged-In: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 Change-Id: I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index a0137df..70de64a 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java
@@ -465,7 +465,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { int pos = 0; if (!isCurrentUserAdmin() && (canSwitchUserNow() || Flags.newMultiuserSettingsUx()) - && !isCurrentUserGuest()) { + && !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));