From 3767434b21800c467c8e2c5a80bfdcb3203199a4 Mon Sep 17 00:00:00 2001
From: Tyler Wear <twear@quicinc.com>
Date: Tue, 28 Jan 2020 16:38:01 -0800
Subject: [PATCH] Update CompareOrUpdateResult with NULL NULL Check

Add a test to CompareOrUpdateResult where the new and old item
list are both NULL.

Test: Updated unit test
Change-Id: I6821028409d29ab864af52685629630cbf16db3b
---
 .../android/net/util/LinkPropertiesUtils.java               | 1 +
 .../unit/src/android/net/util/LinkPropertiesUtilsTest.java  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/staticlibs/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java b/staticlibs/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
index bd96edbf72..812382694a 100644
--- a/staticlibs/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
+++ b/staticlibs/src_frameworkcommon/android/net/util/LinkPropertiesUtils.java
@@ -111,6 +111,7 @@ public final class LinkPropertiesUtils {
                     }
                 }
             }
+
             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 0fa1c52e1a..6ffcc1d0a9 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 @@ public final class LinkPropertiesUtilsTest {
         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
+}