commit 9531458ca514b5ff63984fb3922409a743ccf1f4
author Chris Antol <cantol@google.com> Mon Feb 05 20:36:03 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 05 20:36:03 2024 +0000
tree 6a1f4d17dba30e6a2c19d17ced298fbac91c27d6
parent aed65c34231fb4d997fe71dddcc43e68d924abae
parent 6fdeb081ae920f47b049e116705aad0db0f88234

Merge "Multiple users yields a search result despite being disabled" 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 d39d980..70d8ed3 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -1771,6 +1771,9 @@
                             .updateNonIndexableKeys(niks);
                     new AutoSyncWorkDataPreferenceController(context, null /* parent */)
                             .updateNonIndexableKeys(niks);
+                    if (suppressAllPage) {
+                        niks.add(KEY_ALLOW_MULTIPLE_USERS);
+                    }
                     return niks;
                 }
             };