From 484f0d4901887e141d7384560fa7e382820a3e8e Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 12 Jun 2020 17:59:16 +0900 Subject: [PATCH] Move Inet[4]AddressUtils to libs/net The classes should not be picked up from frameworks/base, as they are part of several mainline modules. Bug: 151052811 Test: m; manual: flashed, wifi and telephony working Test: atest CtsNetTestCasesLatestSdk:CaptivePortalApiTest Change-Id: Ic7534afe3a437f2089ed33cebdad391dc498d187 --- tests/cts/net/src/android/net/cts/CaptivePortalApiTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/CaptivePortalApiTest.kt b/tests/cts/net/src/android/net/cts/CaptivePortalApiTest.kt index 68d5281650..ef2b0cee2f 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 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.platform.app.InstrumentationRegistry 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