diff options
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 6c5aa1d..572abc0 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -38,6 +38,7 @@ import static android.net.wifi.WifiManager.WIFI_AP_STATE_ENABLING; import static android.net.wifi.WifiManager.WIFI_AP_STATE_FAILED; import android.app.ActivityManagerNative; +import android.net.LinkAddress; import android.net.NetworkInfo; import android.net.DhcpInfo; import android.net.NetworkUtils; @@ -1252,19 +1253,14 @@ public class WifiStateMachine extends HierarchicalStateMachine { } private void configureLinkProperties() { - try { - mLinkProperties.setInterface(NetworkInterface.getByName(mInterfaceName)); - } catch (SocketException e) { - Log.e(TAG, "SocketException creating NetworkInterface from " + mInterfaceName + - ". e=" + e); - return; - } catch (NullPointerException e) { - Log.e(TAG, "NPE creating NetworkInterface. e=" + e); - return; - } + + mLinkProperties.setInterfaceName(mInterfaceName); + // TODO - fix this for v6 synchronized (mDhcpInfo) { - mLinkProperties.addAddress(NetworkUtils.intToInetAddress(mDhcpInfo.ipAddress)); + mLinkProperties.addLinkAddress(new LinkAddress( + NetworkUtils.intToInetAddress(mDhcpInfo.ipAddress), + NetworkUtils.intToInetAddress(mDhcpInfo.netmask))); mLinkProperties.setGateway(NetworkUtils.intToInetAddress(mDhcpInfo.gateway)); mLinkProperties.addDns(NetworkUtils.intToInetAddress(mDhcpInfo.dns1)); mLinkProperties.addDns(NetworkUtils.intToInetAddress(mDhcpInfo.dns2)); |