Merge "Revert "Use structural equality for A11yNodeInfo#mChildNodeIds""

2 files changed, 2 insertions, 17 deletions

diff --git a/core/java/android/util/LongArray.java b/core/java/android/util/LongArray.java
index f9454d962eb4..9b0489ca5c6e 100644
--- a/core/java/android/util/LongArray.java
+++ b/core/java/android/util/LongArray.java
@@ -18,10 +18,8 @@ package android.util;
 
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.Preconditions;
-
-import libcore.util.EmptyArray;
-
 import java.util.Arrays;
+import libcore.util.EmptyArray;
 
 /**
  * Implements a growing array of long primitives.
@@ -218,17 +216,4 @@ public class LongArray implements Cloneable {
             throw new ArrayIndexOutOfBoundsException(mSize, index);
         }
     }
-
-    /**
-     * Test if each element of {@code a} equals corresponding element from {@code b}
-     */
-    public static boolean elementsEqual(LongArray a, LongArray b) {
-        if (a.mSize != b.mSize) return false;
-        for (int i = 0; i < a.mSize; i++) {
-            if (a.get(i) != b.get(i)) {
-                return false;
-            }
-        }
-        return true;
-    }
 }
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index 5b1dd5c88cae..417a72530b72 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -3203,7 +3203,7 @@ public class AccessibilityNodeInfo implements Parcelable {
         fieldIndex++;
         if (mConnectionId != DEFAULT.mConnectionId) nonDefaultFields |= bitAt(fieldIndex);
         fieldIndex++;
-        if (!LongArray.elementsEqual(mChildNodeIds, DEFAULT.mChildNodeIds)) {
+        if (!Objects.equals(mChildNodeIds, DEFAULT.mChildNodeIds)) {
             nonDefaultFields |= bitAt(fieldIndex);
         }
         fieldIndex++;