From 464c14649a6c71c542c55cfcc89ff0f4eb227046 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Thu, 10 Oct 2024 16:51:09 +0800 Subject: [PATCH] Use getEnabledProfiles for ProfileSelectDialog In EnableContentCaptureWithServiceSettingsPreferenceController. Which follows current examples OnDeviceRecognitionPreferenceController and ZenModePrioritySendersPreferenceController. Fix: 368646940 Flag: EXEMPT bug fix Test: manual - on "More security & privacy" page Change-Id: I82cc9ba89ff8ef5e21e0ea7539681726b3c69e90 --- ...entCaptureWithServiceSettingsPreferenceController.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java index c8a54712067..46aed3c0022 100644 --- a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java +++ b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java @@ -19,7 +19,6 @@ package com.android.settings.privacy; import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.text.TextUtils; @@ -33,7 +32,6 @@ import com.android.settings.core.TogglePreferenceController; import com.android.settings.dashboard.profileselector.ProfileSelectDialog; import com.android.settings.utils.ContentCaptureUtils; -import java.util.ArrayList; import java.util.List; public final class EnableContentCaptureWithServiceSettingsPreferenceController @@ -94,11 +92,7 @@ public final class EnableContentCaptureWithServiceSettingsPreferenceController private void show(Preference preference) { final UserManager userManager = UserManager.get(mContext); - final List userInfos = userManager.getUsers(); - final ArrayList userHandles = new ArrayList<>(userInfos.size()); - for (UserInfo info : userInfos) { - userHandles.add(info.getUserHandle()); - } + final List userHandles = userManager.getEnabledProfiles(); final Intent intent = preference.getIntent().addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); if (userHandles.size() == 1) { mContext.startActivityAsUser(intent, userHandles.get(0));