diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-06-12 16:54:56 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2020-06-12 17:04:07 +0900 |
| commit | a35fc2ac159b7670f5c4759de76f5eacc699def3 (patch) | |
| tree | 890f7ee2f17a7b5a74af19fe0210cd57172723eb /service | |
| parent | c08e37a56604576e02e6e348cc50a09fb4745562 (diff) | |
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
Change-Id: I2619899f1748775748a55d37de2c6a68661b919d
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 2 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index 6b718bb32..76813703e 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -62,7 +62,6 @@ import android.net.Uri; import android.net.ip.IIpClient; import android.net.ip.IpClientCallbacks; import android.net.ip.IpClientManager; -import android.net.shared.Inet4AddressUtils; import android.net.shared.Layer2Information; import android.net.shared.ProvisioningConfiguration; import android.net.shared.ProvisioningConfiguration.ScanResultInfo; @@ -113,6 +112,7 @@ import com.android.internal.util.MessageUtils; import com.android.internal.util.Protocol; import com.android.internal.util.State; import com.android.internal.util.StateMachine; +import com.android.net.module.util.Inet4AddressUtils; import com.android.server.wifi.MboOceController.BtmFrameData; import com.android.server.wifi.WifiCarrierInfoManager.SimAuthRequestData; import com.android.server.wifi.WifiCarrierInfoManager.SimAuthResponseData; diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 070422775..a398eacaf 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -51,7 +51,6 @@ import android.net.Network; import android.net.NetworkStack; import android.net.Uri; import android.net.ip.IpClientUtil; -import android.net.shared.Inet4AddressUtils; import android.net.wifi.IActionListener; import android.net.wifi.IDppCallback; import android.net.wifi.ILocalOnlyHotspotCallback; @@ -110,6 +109,7 @@ import android.util.MutableBoolean; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.AsyncChannel; +import com.android.net.module.util.Inet4AddressUtils; import com.android.server.wifi.hotspot2.PasspointManager; import com.android.server.wifi.hotspot2.PasspointProvider; import com.android.server.wifi.proto.nano.WifiMetricsProto.UserActionEvent; |