diff --git a/service/src/com/android/server/CallbackQueue.java b/service/src/com/android/server/CallbackQueue.java index 060a984437..4e068eae34 100644 --- a/service/src/com/android/server/CallbackQueue.java +++ b/service/src/com/android/server/CallbackQueue.java @@ -34,8 +34,7 @@ import com.android.net.module.util.GrowingIntArray; * queue.forEach(netId, callbackId -> { [...] }); * queue.addCallback(netId, callbackId); * [...] - * queue.shrinkToLength(); - * storedCallbacks = queue.getBackingArray(); + * storedCallbacks = queue.getMinimizedBackingArray(); * * *

This class is not thread-safe. diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 6ae75050d0..4b0b029062 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -7976,7 +7976,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // Instead of shrinking the queue, possibly reallocating, the NRI could keep the array // and length in memory for future adds, but this saves memory by avoiding the cost // of an extra member and of unused array length (there are often hundreds of NRIs). - mQueuedCallbacks = queue.getShrinkedBackingArray(); + mQueuedCallbacks = queue.getMinimizedBackingArray(); return true; } diff --git a/staticlibs/device/com/android/net/module/util/GrowingIntArray.java b/staticlibs/device/com/android/net/module/util/GrowingIntArray.java index 4a81c10f82..d47738b821 100644 --- a/staticlibs/device/com/android/net/module/util/GrowingIntArray.java +++ b/staticlibs/device/com/android/net/module/util/GrowingIntArray.java @@ -168,7 +168,7 @@ public class GrowingIntArray { * stop using this instance of {@link GrowingIntArray} if they use the array returned by this * method. */ - public int[] getShrinkedBackingArray() { + public int[] getMinimizedBackingArray() { shrinkToLength(); return mValues; } diff --git a/staticlibs/tests/unit/src/com/android/net/module/util/GrowingIntArrayTest.kt b/staticlibs/tests/unit/src/com/android/net/module/util/GrowingIntArrayTest.kt index bdcb8c0b59..4b740e391b 100644 --- a/staticlibs/tests/unit/src/com/android/net/module/util/GrowingIntArrayTest.kt +++ b/staticlibs/tests/unit/src/com/android/net/module/util/GrowingIntArrayTest.kt @@ -109,12 +109,12 @@ class GrowingIntArrayTest { } @Test - fun testGetShrinkedBackingArray() { + fun testGetMinimizedBackingArray() { val array = GrowingIntArray(10) array.add(-1) array.add(2) - assertContentEquals(intArrayOf(-1, 2), array.shrinkedBackingArray) + assertContentEquals(intArrayOf(-1, 2), array.minimizedBackingArray) } @Test diff --git a/tests/unit/java/com/android/server/CallbackQueueTest.kt b/tests/unit/java/com/android/server/CallbackQueueTest.kt index a6dd5c3561..d8d35c1090 100644 --- a/tests/unit/java/com/android/server/CallbackQueueTest.kt +++ b/tests/unit/java/com/android/server/CallbackQueueTest.kt @@ -116,7 +116,7 @@ class CallbackQueueTest { addCallback(TEST_NETID_1, CALLBACK_AVAILABLE) addCallback(TEST_NETID_2, CALLBACK_AVAILABLE) } - val queue2 = CallbackQueue(queue1.shrinkedBackingArray) + val queue2 = CallbackQueue(queue1.minimizedBackingArray) assertQueueEquals(listOf( TEST_NETID_1 to CALLBACK_AVAILABLE, TEST_NETID_2 to CALLBACK_AVAILABLE