commit b96b58b7fc8c7e7305954ca9da7247bd5b4bb108
author Remi NGUYEN VAN <reminv@google.com> Fri Jun 19 01:09:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 19 01:09:12 2020 +0000
tree 1bd398287f4944085187a768beeffa63bcef631d
parent 24308cca9bbecbdfe8c835bd13935bdcb7adbdf2
parent a530216c7d2c5e632163aa6dcd46d72feb254b92

Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: a530216c7d

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11835437

Change-Id: I421c4ef58232a4d7a5d3580d9b17c2660eb2b2e0

tests/cts/net/src/android/net/cts/CaptivePortalApiTest.kt

diff --git a/tests/cts/net/src/android/net/cts/CaptivePortalApiTest.kt b/tests/cts/net/src/android/net/cts/CaptivePortalApiTest.kt
index 68d5281..ef2b0ce 100644
--- a/tests/cts/net/src/android/net/cts/CaptivePortalApiTest.kt
+++ b/tests/cts/net/src/android/net/cts/CaptivePortalApiTest.kt
@@ -35,8 +35,6 @@
 import android.net.dhcp.DhcpPacket.DHCP_MESSAGE_TYPE_DISCOVER
 import android.net.dhcp.DhcpPacket.DHCP_MESSAGE_TYPE_REQUEST
 import android.net.dhcp.DhcpRequestPacket
-import android.net.shared.Inet4AddressUtils.getBroadcastAddress
-import android.net.shared.Inet4AddressUtils.getPrefixMaskAsInet4Address
 import android.os.Build
 import android.os.HandlerThread
 import android.platform.test.annotations.AppModeFull
@@ -44,6 +42,8 @@
 import androidx.test.runner.AndroidJUnit4
 import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
 import com.android.compatibility.common.util.ThrowingRunnable
+import com.android.net.module.util.Inet4AddressUtils.getBroadcastAddress
+import com.android.net.module.util.Inet4AddressUtils.getPrefixMaskAsInet4Address
 import com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY
 import com.android.testutils.DevSdkIgnoreRule
 import com.android.testutils.DhcpClientPacketFilter