Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4282183 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Replace LinkedList by a more performant collection" into tm-dev am: a8dcbbb9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17001452

Change-Id: I4192bae92ba277e12ee7d84f7627944fa28f5e52
parents 634e15e0 a8dcbbb9

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -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;
@@ -3685,7 +3686,7 @@ public final class ViewRootImpl implements ViewParent, 
            return current;

        }



        final Queue<AccessibilityNodeInfo> fringe = new LinkedList<>();

        final Queue<AccessibilityNodeInfo> fringe = new ArrayDeque<>();

        fringe.offer(current);



        while (!fringe.isEmpty()) {

core/java/android/view/accessibility/AccessibilityInteractionClient.java

+3 −3
Original line number Diff line number Diff line
@@ -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<String>(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<AccessibilityNodeInfo> seen = new HashSet<>();

        Queue<AccessibilityNodeInfo> fringe = new LinkedList<>();

        Queue<AccessibilityNodeInfo> fringe = new ArrayDeque<>();

        fringe.add(root);

        while (!fringe.isEmpty()) {

            AccessibilityNodeInfo current = fringe.poll();

core/java/android/view/textservice/SpellCheckerSession.java

+2 −2
Original line number Diff line number Diff line
@@ -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<SpellCheckerParams> mPendingTasks = new LinkedList<>();

        private final Queue<SpellCheckerParams> mPendingTasks = new ArrayDeque<>();

        @GuardedBy("SpellCheckerSessionListenerImpl.this")

        private SpellCheckerSession mSpellCheckerSession;