Merge "Move more network unit tests to common tests" am: bce9cb271f

am: 457b5be451

Change-Id: I9f708a252ab606b782f5f828dce8c1690c3703bf

tests/net/Android.bp

@@ -6,6 +6,7 @@ java_defaults {
     static_libs: [
         "FrameworksNetCommonTests",
         "frameworks-base-testutils",
+        "frameworks-net-testutils",
         "framework-protos",
         "androidx.test.rules",
         "mockito-target-minus-junit4",

tests/net/common/Android.bp

@@ -21,6 +21,7 @@ java_library {
     srcs: ["java/**/*.java"],
     static_libs: [
         "androidx.test.rules",
+        "frameworks-net-testutils",
         "junit",
     ],
     libs: [

tests/net/common/java/android/net/apf/ApfCapabilitiesTest.java

@@ -19,11 +19,10 @@ package android.net.apf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
-import android.net.shared.ParcelableTestUtil;
-
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.internal.util.ParcelableTestUtil;
 import com.android.internal.util.TestUtils;
 
 import org.junit.Test;