commit 8508e6637b3b142f1bd315af9f07b1e5d0a63dea
author Tzuhao Tseng <tzuhao.tseng@mediatek.com> Thu Nov 28 15:55:32 2024 +0800
committer Tzuhao Tseng <tzuhao.tseng@mediatek.com> Tue Dec 03 01:44:20 2024 +0000
tree ec2bb06fe81a1d504f764754e27ebd2de4b1d85d
parent af9fdf0a441c861cf0804982de1eae7cdbd587e7

Fix DnsEvent ArrayIndexOutOfBound error

If both eventCount and eventTypes.length are equal to 1,
then after resizing the eventTypes array, its length remains 1.
Therefore, attempting to access eventTypes[eventCount] = eventType
would result in an ArrayIndexOutOfBoundsException error.

If the length of the eventTypes array remains the same as eventCount
after resizing, then the length of the eventTypes array needs to be
incremented by 1 again.

Test: GOTA test
Bug: 381457920
Change-Id: I7926961e6a94a976524f729d049ee7164a48d233

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;