Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9d76f5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove "Add supervised user" from search result if such user type is...

Merge "Remove "Add supervised user" from search result if such user type is not allowed on the device" into main
parents c8fcd603 92ada7e3
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -1860,6 +1860,10 @@ public class UserSettings extends SettingsPreferenceFragment
                        boolean suppressAllPage) {
                    final List<String> 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);