commit 6fdeb081ae920f47b049e116705aad0db0f88234
author David Magno <david.magno@sony.com> Tue Jan 30 19:26:36 2024 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Jan 30 19:26:36 2024 +0000
tree afd8f686a2568744501e1540bb84cb1c23c6ad27
parent ee85a6e0e9f4ae866d1f5847f0c2b8d3d957cf9e

Multiple users yields a search result despite being disabled

'Multiple users' still yields a search result, even if the multiple
users functionality is unavailable on the device.

Bug: 298548379
Test: Manual
(cherry picked from https://partner-android-review.googlesource.com/q/commit:e7afc620ef3d9d7b05835c9bf31394cecf3b77b5)
Merged-In: I224668afacc115326ca9279d7b99bfe7d95ee79c
Change-Id: I224668afacc115326ca9279d7b99bfe7d95ee79c

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;
                 }
             };