Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace LinkedList by a more performant collection

Browse Source 
This is a semi-automatic change.
See https://errorprone.info/bugpattern/JdkObsolete for the rationale.

Test: make
Bug: 221046110
(cherry picked from commit 1c8715261d)
Merged-In:I15328005007ddc58f56604f6064c30fbed2c01a6

Change-Id: Id7e0a766007a04f336bed732f1e32f7f1f4da041
This commit is contained in:
Nikolas Havrikov
2022-02-24 10:10:20 +00:00
committed by Cherrypicker Worker
parent 3a4774d2c6 236e833e04
commit ebe16bb3ac
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/ViewRootImpl.java
View File

@@ -217,6 +217,7 @@ import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
@@ -3685,7 +3686,7 @@ public final class ViewRootImpl implements ViewParent,
return current; return current;
} }
final Queue<AccessibilityNodeInfo> fringe = new LinkedList<>(); final Queue<AccessibilityNodeInfo> fringe = new ArrayDeque<>();
fringe.offer(current); fringe.offer(current);
while (!fringe.isEmpty()) { while (!fringe.isEmpty()) {

6
core/java/android/view/accessibility/AccessibilityInteractionClient.java
View File

@@ -46,11 +46,11 @@ import android.view.ViewConfiguration;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@@ -1166,7 +1166,7 @@ public final class AccessibilityInteractionClient
+ connectionIdWaitingForPrefetchResultCopy + ";Result: " + infos, + connectionIdWaitingForPrefetchResultCopy + ";Result: " + infos,
Binder.getCallingUid(), Binder.getCallingUid(),
Arrays.asList(Thread.currentThread().getStackTrace()), Arrays.asList(Thread.currentThread().getStackTrace()),
new HashSet<String>(Arrays.asList("getStackTrace")), new HashSet<>(Collections.singletonList("getStackTrace")),
FLAGS_ACCESSIBILITY_INTERACTION_CONNECTION_CALLBACK); FLAGS_ACCESSIBILITY_INTERACTION_CONNECTION_CALLBACK);
} }
} else if (DEBUG) { } else if (DEBUG) {
@@ -1348,7 +1348,7 @@ public final class AccessibilityInteractionClient
} }
// Check for duplicates. // Check for duplicates.
HashSet<AccessibilityNodeInfo> seen = new HashSet<>(); HashSet<AccessibilityNodeInfo> seen = new HashSet<>();
Queue<AccessibilityNodeInfo> fringe = new LinkedList<>(); Queue<AccessibilityNodeInfo> fringe = new ArrayDeque<>();
fringe.add(root); fringe.add(root);
while (!fringe.isEmpty()) { while (!fringe.isEmpty()) {
AccessibilityNodeInfo current = fringe.poll(); AccessibilityNodeInfo current = fringe.poll();

4
core/java/android/view/textservice/SpellCheckerSession.java
View File

@@ -39,7 +39,7 @@ import com.android.internal.textservice.ITextServicesSessionListener;
import dalvik.system.CloseGuard; import dalvik.system.CloseGuard;
import java.util.LinkedList; import java.util.ArrayDeque;
import java.util.Locale; import java.util.Locale;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@@ -245,7 +245,7 @@ public class SpellCheckerSession {
} }
} }
private final Queue<SpellCheckerParams> mPendingTasks = new LinkedList<>(); private final Queue<SpellCheckerParams> mPendingTasks = new ArrayDeque<>();
@GuardedBy("SpellCheckerSessionListenerImpl.this") @GuardedBy("SpellCheckerSessionListenerImpl.this")
private SpellCheckerSession mSpellCheckerSession; private SpellCheckerSession mSpellCheckerSession;