From 6fdeb081ae920f47b049e116705aad0db0f88234 Mon Sep 17 00:00:00 2001 From: David Magno Date: Tue, 30 Jan 2024 19:26:36 +0000 Subject: [PATCH] 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index d39d980f29d..70d8ed371ef 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -1771,6 +1771,9 @@ public class UserSettings extends SettingsPreferenceFragment .updateNonIndexableKeys(niks); new AutoSyncWorkDataPreferenceController(context, null /* parent */) .updateNonIndexableKeys(niks); + if (suppressAllPage) { + niks.add(KEY_ALLOW_MULTIPLE_USERS); + } return niks; } };