commit f9d76f5cc499edd24199f0df1afd35efa3d65111
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 08 17:54:53 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 08 17:54:53 2024 +0000
tree 339a9ac3c20d6ba52c1244f1ee8482c3e2208bcd
parent c8fcd603eb5a6626ec6f5933d8a02e4d639ed0e7
parent 92ada7e3a53429fad702069c0da20f59ee7ee6ca

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

src/com/android/settings/users/UserSettings.java

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 3188240..0881b29 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -1860,6 +1860,10 @@
                         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);