diff options
author | Aaron Huang <huangaaron@google.com> | 2019-11-16 03:45:37 +0800 |
---|---|---|
committer | Aaron Huang <huangaaron@google.com> | 2019-12-15 19:58:44 +0800 |
commit | 992a31ed08bf744b874853e48072427d93ad91ac (patch) | |
tree | a673d18a2584e2ffa7658a2dd9ff131c158f6af6 /service | |
parent | e619e603c4487cb980f641589acc2fda23b78e09 (diff) |
Change import class path of InvalidPacketException
InvalidPacketException is moved to android.net so
change the import class path.
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
atest android.net.cts
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
atest android.net.wifi.cts
Change-Id: I784885bcb787fb7c5ca6320047b61a5d9dec1d0c
Diffstat (limited to 'service')
-rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index f358e9acd..741042b78 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -36,6 +36,7 @@ import android.content.pm.PackageManager; import android.database.ContentObserver; import android.net.ConnectivityManager; import android.net.DhcpResults; +import android.net.InvalidPacketException; import android.net.IpConfiguration; import android.net.KeepalivePacketData; import android.net.LinkProperties; @@ -50,7 +51,6 @@ import android.net.NetworkInfo.DetailedState; import android.net.NetworkMisc; import android.net.RouteInfo; import android.net.SocketKeepalive; -import android.net.SocketKeepalive.InvalidPacketException; import android.net.StaticIpConfiguration; import android.net.TcpKeepalivePacketData; import android.net.ip.IIpClient; @@ -1249,7 +1249,7 @@ public class ClientModeImpl extends StateMachine { String dstMacStr = macAddressFromRoute(gateway.getHostAddress()); return NativeUtil.macAddressToByteArray(dstMacStr); } catch (NullPointerException | IllegalArgumentException e) { - throw new InvalidPacketException(SocketKeepalive.ERROR_INVALID_IP_ADDRESS); + throw new InvalidPacketException(InvalidPacketException.ERROR_INVALID_IP_ADDRESS); } } @@ -1260,7 +1260,7 @@ public class ClientModeImpl extends StateMachine { } else if (packetData.dstAddress instanceof Inet6Address) { return OsConstants.ETH_P_IPV6; } else { - throw new InvalidPacketException(SocketKeepalive.ERROR_INVALID_IP_ADDRESS); + throw new InvalidPacketException(InvalidPacketException.ERROR_INVALID_IP_ADDRESS); } } |