Merge "Add IpRange utility to convert IP ranges to IpPrefix"
diff --git a/staticlibs/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java b/staticlibs/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
index bd96edb..8123826 100644
--- a/staticlibs/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
+++ b/staticlibs/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
@@ -111,6 +111,7 @@
}
}
}
+
removed.addAll(updateTracker.values());
}
diff --git a/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java b/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
index 0fa1c52..6ffcc1d 100644
--- a/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
+++ b/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
@@ -254,5 +254,9 @@
result = new CompareOrUpdateResult<String, String>(oldItems, null, extractPrefix);
assertCompareOrUpdateResult(result,
emptyList, strArray("hello123", "howareyou669", "goodbye5678"), emptyList);
+
+ // Null -> null: all lists empty.
+ result = new CompareOrUpdateResult<String, String>(null, null, extractPrefix);
+ assertCompareOrUpdateResult(result, emptyList, emptyList, emptyList);
}
-}
\ No newline at end of file
+}