Merge "Add initTestNetwork with a list of LinkAddress"
diff --git a/staticlibs/framework/com/android/net/module/util/CollectionUtils.java b/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
index 0696cca..6e1af55 100644
--- a/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/CollectionUtils.java
@@ -123,6 +123,19 @@
/**
* @return true if the array contains the specified value.
*/
+ public static boolean contains(@Nullable short[] array, short value) {
+ if (array == null) return false;
+ for (int element : array) {
+ if (element == value) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @return true if the array contains the specified value.
+ */
public static boolean contains(@Nullable int[] array, int value) {
if (array == null) return false;
for (int element : array) {
diff --git a/staticlibs/tests/unit/src/com/android/net/module/util/CollectionUtilsTest.kt b/staticlibs/tests/unit/src/com/android/net/module/util/CollectionUtilsTest.kt
index 0886426..96648a5 100644
--- a/staticlibs/tests/unit/src/com/android/net/module/util/CollectionUtilsTest.kt
+++ b/staticlibs/tests/unit/src/com/android/net/module/util/CollectionUtilsTest.kt
@@ -61,4 +61,20 @@
assertTrue(CollectionUtils.all(listOf(1)) { true })
assertFalse(CollectionUtils.all(listOf(1)) { false })
}
+
+ @Test
+ fun testContains() {
+ assertTrue(CollectionUtils.contains(shortArrayOf(10, 20, 30), 10))
+ assertTrue(CollectionUtils.contains(shortArrayOf(10, 20, 30), 30))
+ assertFalse(CollectionUtils.contains(shortArrayOf(10, 20, 30), 40))
+ assertFalse(CollectionUtils.contains(null, 10.toShort()))
+ assertTrue(CollectionUtils.contains(intArrayOf(10, 20, 30), 10))
+ assertTrue(CollectionUtils.contains(intArrayOf(10, 20, 30), 30))
+ assertFalse(CollectionUtils.contains(intArrayOf(10, 20, 30), 40))
+ assertFalse(CollectionUtils.contains(null, 10.toInt()))
+ assertTrue(CollectionUtils.contains(arrayOf("A", "B", "C"), "A"))
+ assertTrue(CollectionUtils.contains(arrayOf("A", "B", "C"), "C"))
+ assertFalse(CollectionUtils.contains(arrayOf("A", "B", "C"), "D"))
+ assertFalse(CollectionUtils.contains(null, "A"))
+ }
}