From 1c8715261d360cc1b3e43b03756d15b21a3b4063 Mon Sep 17 00:00:00 2001 From: Nikolas Havrikov Date: Wed, 23 Feb 2022 16:15:12 +0100 Subject: [PATCH] Replace LinkedList by a more performant collection This is a semi-automatic change. See https://errorprone.info/bugpattern/JdkObsolete for the rationale. Test: make Bug: 221046110 Change-Id: I15328005007ddc58f56604f6064c30fbed2c01a6 --- core/java/android/view/ViewRootImpl.java | 3 ++- .../view/accessibility/AccessibilityInteractionClient.java | 6 +++--- core/java/android/view/textservice/SpellCheckerSession.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 844403298cc97..4e9a31c1d7334 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -217,6 +217,7 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.ref.WeakReference; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -3693,7 +3694,7 @@ public final class ViewRootImpl implements ViewParent, return current; } - final Queue fringe = new LinkedList<>(); + final Queue fringe = new ArrayDeque<>(); fringe.offer(current); while (!fringe.isEmpty()) { diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java index 07b7a18b6795b..68532781f08b8 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -46,11 +46,11 @@ import android.view.ViewConfiguration; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Queue; import java.util.concurrent.atomic.AtomicInteger; @@ -1166,7 +1166,7 @@ public final class AccessibilityInteractionClient + connectionIdWaitingForPrefetchResultCopy + ";Result: " + infos, Binder.getCallingUid(), Arrays.asList(Thread.currentThread().getStackTrace()), - new HashSet(Arrays.asList("getStackTrace")), + new HashSet<>(Collections.singletonList("getStackTrace")), FLAGS_ACCESSIBILITY_INTERACTION_CONNECTION_CALLBACK); } } else if (DEBUG) { @@ -1348,7 +1348,7 @@ public final class AccessibilityInteractionClient } // Check for duplicates. HashSet seen = new HashSet<>(); - Queue fringe = new LinkedList<>(); + Queue fringe = new ArrayDeque<>(); fringe.add(root); while (!fringe.isEmpty()) { AccessibilityNodeInfo current = fringe.poll(); diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java index 6cfb9381f1308..5d9f4f630fc00 100644 --- a/core/java/android/view/textservice/SpellCheckerSession.java +++ b/core/java/android/view/textservice/SpellCheckerSession.java @@ -39,7 +39,7 @@ import com.android.internal.textservice.ITextServicesSessionListener; import dalvik.system.CloseGuard; -import java.util.LinkedList; +import java.util.ArrayDeque; import java.util.Locale; import java.util.Queue; import java.util.concurrent.Executor; @@ -245,7 +245,7 @@ public class SpellCheckerSession { } } - private final Queue mPendingTasks = new LinkedList<>(); + private final Queue mPendingTasks = new ArrayDeque<>(); @GuardedBy("SpellCheckerSessionListenerImpl.this") private SpellCheckerSession mSpellCheckerSession;