commit 990f0bcb2ca2660d7fcd1678497707568e6ae362
author Maciej Żenczykowski <maze@google.com> Tue Dec 03 19:02:23 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 03 19:02:23 2024 +0000
tree 8f8a9fea19acff2b2a4ad20597b527823fddd249
parent cc105341ef5ce4d2e1cadde623e3487cf4ec7400
parent 8508e6637b3b142f1bd315af9f07b1e5d0a63dea

Merge "Fix DnsEvent ArrayIndexOutOfBound error" into main

core/java/android/net/metrics/DnsEvent.java

diff --git a/core/java/android/net/metrics/DnsEvent.java b/core/java/android/net/metrics/DnsEvent.java
index bf351ce..f53d1c4 100644
--- a/core/java/android/net/metrics/DnsEvent.java
+++ b/core/java/android/net/metrics/DnsEvent.java
@@ -62,7 +62,11 @@
             return isSuccess;
         }
         if (eventCount == eventTypes.length) {
-            resize((int) (1.4 * eventCount));
+            int resizeLength = (int) (1.4 * eventCount);
+            if (eventCount == resizeLength) {
+                resizeLength++;
+            }
+            resize(resizeLength);
         }
         eventTypes[eventCount] = eventType;
         returnCodes[eventCount] = returnCode;