From f33665750893ddf869dd3ed642a824c15ef14940 Mon Sep 17 00:00:00 2001 From: hoffc Date: Mon, 13 Nov 2023 09:10:07 +0800 Subject: [PATCH] Settings: remove multiple users search when multi-user not supported When multi-user feature not supported in framework, SettingsIntelligence should not build the index of multiple users for searching. Return empty list when multi-user feature not supported during building search index. Change-Id: Id2fb8f2066784d63bbfd5c396da88b04306a3563 Bug: 310108420 --- 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 28e02ec16e2..7d316326c65 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -1719,6 +1719,9 @@ public class UserSettings extends SettingsPreferenceFragment public List getRawDataToIndex(Context context, boolean enabled) { final List rawData = new ArrayList<>(); + if (!UserManager.supportsMultipleUsers()) { + return rawData; + } SearchIndexableRaw allowMultipleUsersResult = new SearchIndexableRaw(context);