Merge "Remove "Add supervised user" from search result if such user type is not allowed on the device" into main

This commit is contained in:
Treehugger Robot
2024-10-08 17:54:53 +00:00
committed by Android (Google) Code Review

View File

@@ -1860,6 +1860,10 @@ public class UserSettings extends SettingsPreferenceFragment
boolean suppressAllPage) { boolean suppressAllPage) {
final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId, final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId,
suppressAllPage); suppressAllPage);
if (TextUtils.isEmpty(context.getString(
com.android.internal.R.string.config_supervisedUserCreationPackage))) {
niks.add(KEY_ADD_SUPERVISED_USER);
}
AddUserWhenLockedPreferenceController controller = AddUserWhenLockedPreferenceController controller =
new AddUserWhenLockedPreferenceController( new AddUserWhenLockedPreferenceController(
context, KEY_ADD_USER_WHEN_LOCKED); context, KEY_ADD_USER_WHEN_LOCKED);