From 92ada7e3a53429fad702069c0da20f59ee7ee6ca Mon Sep 17 00:00:00 2001 From: Tetiana Meronyk Date: Thu, 3 Oct 2024 17:25:55 +0000 Subject: [PATCH] Remove "Add supervised user" from search result if such user type is not allowed on the device Bug: 371202325 Test: manual: 1. Open settings 2. Search "Add user" 3. Verify "Add supervised user" does not come up Flag: EXEMPT bugfix Change-Id: Iaf96bd8d7ffde4f9d09f14af1de422e1b1d39eda --- src/com/android/settings/users/UserSettings.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 31882408fd7..0881b29a3b3 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -1860,6 +1860,10 @@ public class UserSettings extends SettingsPreferenceFragment boolean suppressAllPage) { final List niks = super.getNonIndexableKeysFromXml(context, xmlResId, suppressAllPage); + if (TextUtils.isEmpty(context.getString( + com.android.internal.R.string.config_supervisedUserCreationPackage))) { + niks.add(KEY_ADD_SUPERVISED_USER); + } AddUserWhenLockedPreferenceController controller = new AddUserWhenLockedPreferenceController( context, KEY_ADD_USER_WHEN_LOCKED);