joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Use helper function getIndexForValue in MulticastRoutingCoordinator.

Browse source 
The SparseArray.indexOfValue() uses == to compare values,
MulticastRoutingCoordinator uses SparseArray with String type values,
and the indexOfValue function would sometimes return -1 when looking for
a value in the SparseArray.

Added a helper function getIndexForValue in CollectionUtils to get index
by comparing values with equals, and used this function in MulticastRoutingCoordinator.

Updated
MulticastRoutingCoordinatorServiceTest#testMulticastRouting_applyConfigNone_removesMfc
test case to use copies of interface names when updating the multicast
configs, so the test would fail without this fix.

Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.CollectionUtilsTest#testGetIndexForValue
atest android.net.connectivity.com.android.server.connectivity.MulticastRoutingCoordinatorServiceTest#testMulticastRouting_applyConfigNone_removesMfc

Change-Id: I862242d6be01b8552cdd6af6c9691948a9f0bfe0
This commit is contained in:
Yang Sun 2024-04-14 16:24:37 +08:00
commit 4e7baadc71
1 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
staticlibs/tests/unit/src/com/android/net/module/util/CollectionUtilsTest.kt
View file

@ -16,6 +16,7 @@
package com.android.net.module.util
import android.util.SparseArray
import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4
import com.android.testutils.assertThrows
@ -179,4 +180,20 @@ class CollectionUtilsTest {
CollectionUtils.assoc(listOf(1, 2), list15)
}
}
@Test
fun testGetIndexForValue() {
val sparseArray = SparseArray<String>();
sparseArray.put(5, "hello");
sparseArray.put(10, "abcd");
sparseArray.put(20, null);
val value1 = "abcd";
val value1Copy = String(value1.toCharArray())
val value2 = null;
assertEquals(1, CollectionUtils.getIndexForValue(sparseArray, value1));
assertEquals(1, CollectionUtils.getIndexForValue(sparseArray, value1Copy));
assertEquals(2, CollectionUtils.getIndexForValue(sparseArray, value2));
}
}