commit 9623f122dfda5d66ca761618b375128b49f32f2d
author Remi NGUYEN VAN <reminv@google.com> Fri Oct 09 00:30:36 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 09 00:30:36 2020 +0000
tree b90e851120ae0af65d24a9c9204745511f7a4158
parent 18b5773041e55201fe27a41819acc07572452043
parent 4cb4ef833397b162b229c135146694cfee85782d

Merge "Move IpUtils to frameworks/libs/net" am: 4cb4ef8333

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234

Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515

Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java

diff --git a/Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java b/Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java
index 747d3e8..95e36fa 100644
--- a/Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java
+++ b/Tethering/tests/privileged/src/android/net/ip/DadProxyTest.java
@@ -33,7 +33,6 @@
 import android.net.TestNetworkInterface;
 import android.net.TestNetworkManager;
 import android.net.util.InterfaceParams;
-import android.net.util.IpUtils;
 import android.net.util.TetheringUtils;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -46,6 +45,7 @@
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.net.module.util.IpUtils;
 import com.android.testutils.TapPacketReader;
 
 import org.junit.After;