diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index ef7c2ba02e1..093f644d0a7 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -22,7 +22,6 @@ import android.app.settings.SettingsEnums; import android.content.ComponentName; import android.content.Context; import android.content.pm.ActivityInfo; -import android.content.pm.ServiceInfo; import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; @@ -389,17 +388,11 @@ public class AccessibilitySettings extends DashboardFragment { final List installedShortcutList = a11yManager.getInstalledAccessibilityShortcutListAsUser(context, UserHandle.myUserId()); - - // Remove duplicate item here, new a ArrayList to copy unmodifiable list result - // (getInstalledAccessibilityServiceList). final List installedServiceList = new ArrayList<>( a11yManager.getInstalledAccessibilityServiceList()); - installedServiceList.removeIf( - target -> containsTargetNameInList(installedShortcutList, target)); final List activityList = preferenceHelper.createAccessibilityActivityPreferenceList(installedShortcutList); - final List serviceList = preferenceHelper.createAccessibilityServicePreferenceList(installedServiceList); @@ -410,24 +403,6 @@ public class AccessibilitySettings extends DashboardFragment { return preferenceList; } - private boolean containsTargetNameInList(List shortcutInfos, - AccessibilityServiceInfo targetServiceInfo) { - final ServiceInfo serviceInfo = targetServiceInfo.getResolveInfo().serviceInfo; - final String servicePackageName = serviceInfo.packageName; - final CharSequence serviceLabel = serviceInfo.loadLabel(getPackageManager()); - - for (int i = 0, count = shortcutInfos.size(); i < count; ++i) { - final ActivityInfo activityInfo = shortcutInfos.get(i).getActivityInfo(); - final String activityPackageName = activityInfo.packageName; - final CharSequence activityLabel = activityInfo.loadLabel(getPackageManager()); - if (servicePackageName.equals(activityPackageName) - && serviceLabel.equals(activityLabel)) { - return true; - } - } - return false; - } - private void initializePreBundledServicesMapFromArray(String categoryKey, int key) { String[] services = getResources().getStringArray(key); PreferenceCategory category = mCategoryToPrefCategoryMap.get(categoryKey);