Snap for 6981242 from 99672853a8303dcd2fc1fd5c01a3818203210ce6 to mainline-releaser_aml_301500702android-mainline-11.0.0_r6android-mainline-11.0.0_r4android11-mainline-sparse-2021-jan-release

Change-Id: Iab1b88810193a765c5079aad6d4dfd51dded7de6

5 files changed, 76 insertions, 8 deletions

diff --git a/common/Android.bp b/common/Android.bp
index 08febfe2..a1a998eb 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -45,6 +45,7 @@ java_library {
   ],
   visibility: [
         "//frameworks/base/packages/Tethering",
+        "//packages/modules/Connectivity/Tethering",
         "//frameworks/opt/net/ike",
         "//frameworks/opt/net/wifi/service",
         "//frameworks/opt/net/telephony",
@@ -123,7 +124,9 @@ java_library {
     jarjar_rules: "jarjar-rules-shared.txt",
     visibility: [
         "//cts/tests/tests/net",
+        "//packages/modules/Connectivity/tests/cts/net",
         "//frameworks/base/packages/Tethering",
+        "//packages/modules/Connectivity/Tethering",
         "//frameworks/base/tests:__subpackages__",
         "//frameworks/opt/net/ike",
         "//frameworks/opt/telephony",
@@ -134,10 +137,20 @@ java_library {
     ]
 }
 
+filegroup {
+    name: "net-utils-services-common-srcs",
+    srcs: [
+        "device/android/net/NetworkFactory.java",
+    ],
+    visibility: [
+        "//frameworks/base/services/net",
+    ],
+}
+
 java_library {
     name: "net-utils-services-common",
     srcs: [
-        "device/android/net/NetworkFactory.java",
+        ":net-utils-services-common-srcs",
         ":framework-annotations",
     ],
     sdk_version: "system_current",
diff --git a/common/tests/unit/Android.bp b/common/tests/unit/Android.bp
index f18ffcfd..c20b87db 100644
--- a/common/tests/unit/Android.bp
+++ b/common/tests/unit/Android.bp
@@ -6,7 +6,6 @@ android_library {
     name: "NetworkStaticLibTestsLib",
     srcs: ["src/**/*.java","src/**/*.kt"],
     min_sdk_version: "29",
-    jarjar_rules: "jarjar-rules.txt",
     static_libs: [
         "net-utils-framework-common",
         "androidx.test.rules",
@@ -17,8 +16,10 @@ android_library {
         "android.test.runner",
         "android.test.base",
     ],
+    jarjar_rules: "jarjar-rules-sharedlib.txt",
     visibility: [
         "//frameworks/base/packages/Tethering/tests/integration",
+        "//packages/modules/Connectivity/Tethering/tests/integration",
         "//packages/modules/NetworkStack/tests/integration",
     ]
 }
@@ -29,6 +30,7 @@ android_test {
     static_libs: [
         "NetworkStaticLibTestsLib",
     ],
+    jarjar_rules: "jarjar-rules.txt",
     test_suites: ["device-tests"],
 }
 
diff --git a/common/tests/unit/jarjar-rules-sharedlib.txt b/common/tests/unit/jarjar-rules-sharedlib.txt
new file mode 100644
index 00000000..fceccfb7
--- /dev/null
+++ b/common/tests/unit/jarjar-rules-sharedlib.txt
@@ -0,0 +1,6 @@
+# TODO: move the classes to the target package in java
+rule android.net.util.IpRange* com.android.net.module.util.IpRange@1
+rule android.net.util.MacAddressUtils* com.android.net.module.util.MacAddressUtils@1
+rule android.net.util.LinkPropertiesUtils* com.android.net.module.util.LinkPropertiesUtils@1
+rule android.net.util.NetUtils* com.android.net.module.util.NetUtils@1
+rule android.net.util.nsd.** com.android.net.module.util.nsd.@1
diff --git a/common/tests/unit/jarjar-rules.txt b/common/tests/unit/jarjar-rules.txt
index 0f131b20..e032ae50 100644
--- a/common/tests/unit/jarjar-rules.txt
+++ b/common/tests/unit/jarjar-rules.txt
@@ -1,7 +1 @@
-# TODO: move the classes to the target package in java
-rule android.net.util.IpRange* com.android.net.moduletests.util.IpRange@1
-rule android.net.util.MacAddressUtils* com.android.net.moduletests.util.MacAddressUtils@1
-rule android.net.util.LinkPropertiesUtils* com.android.net.moduletests.util.LinkPropertiesUtils@1
-rule android.net.util.NetUtils* com.android.net.moduletests.util.NetUtils@1
-rule android.net.util.nsd.** com.android.net.moduletests.util.nsd.@1
 rule com.android.net.module.util.** com.android.net.moduletests.util.@1
diff --git a/common/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java b/common/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
index 6ffcc1d0..2142090b 100644
--- a/common/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
+++ b/common/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
@@ -28,6 +28,7 @@ import android.net.ProxyInfo;
 import android.net.RouteInfo;
 import android.net.util.LinkPropertiesUtils.CompareOrUpdateResult;
 import android.net.util.LinkPropertiesUtils.CompareResult;
+import android.util.ArraySet;
 
 import androidx.test.runner.AndroidJUnit4;
 
@@ -166,6 +167,58 @@ public final class LinkPropertiesUtilsTest {
         assertFalse(LinkPropertiesUtils.isIdenticalHttpProxy(target, source));
     }
 
+    private <T> void compareResult(List<T> oldItems, List<T> newItems, List<T> expectRemoved,
+            List<T> expectAdded) {
+        CompareResult<T> result = new CompareResult<>(oldItems, newItems);
+        assertEquals(new ArraySet<>(expectAdded), new ArraySet<>(result.added));
+        assertEquals(new ArraySet<>(expectRemoved), (new ArraySet<>(result.removed)));
+    }
+
+    @Test
+    public void testCompareResult() {
+        // Either adding or removing items
+        compareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(1),
+                Arrays.asList(2, 3, 4), new ArrayList<>());
+        compareResult(Arrays.asList(1, 2), Arrays.asList(3, 2, 1, 4),
+                new ArrayList<>(), Arrays.asList(3, 4));
+
+
+        // adding and removing items at the same time
+        compareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(2, 3, 4, 5),
+                Arrays.asList(1), Arrays.asList(5));
+        compareResult(Arrays.asList(1, 2, 3), Arrays.asList(4, 5, 6),
+                Arrays.asList(1, 2, 3), Arrays.asList(4, 5, 6));
+
+        // null cases
+        compareResult(Arrays.asList(1, 2, 3), null, Arrays.asList(1, 2, 3), new ArrayList<>());
+        compareResult(null, Arrays.asList(3, 2, 1), new ArrayList<>(), Arrays.asList(1, 2, 3));
+        compareResult(null, null, new ArrayList<>(), new ArrayList<>());
+
+        // Some more tests with strings
+        final ArrayList<String> list1 = new ArrayList<>();
+        list1.add("string1");
+
+        final ArrayList<String> list2 = new ArrayList<>(list1);
+        final CompareResult<String> cr1 = new CompareResult<>(list1, list2);
+        assertTrue(cr1.added.isEmpty());
+        assertTrue(cr1.removed.isEmpty());
+
+        list2.add("string2");
+        final CompareResult<String> cr2 = new CompareResult<>(list1, list2);
+        assertEquals(Arrays.asList("string2"), cr2.added);
+        assertTrue(cr2.removed.isEmpty());
+
+        list2.remove("string1");
+        final CompareResult<String> cr3 = new CompareResult<>(list1, list2);
+        assertEquals(Arrays.asList("string2"), cr3.added);
+        assertEquals(Arrays.asList("string1"), cr3.removed);
+
+        list1.add("string2");
+        final CompareResult<String> cr4 = new CompareResult<>(list1, list2);
+        assertTrue(cr4.added.isEmpty());
+        assertEquals(Arrays.asList("string1"), cr3.removed);
+    }
+
     @Test
     public void testCompareAddresses() {
         final LinkProperties source = createTestObject();