diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-08-27 09:24:29 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2010-08-27 11:05:11 -0700 |
| commit | 585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b (patch) | |
| tree | 257ca7032592dbd69e2d213bc8cca1ace651c8ac /wifi | |
| parent | e73d10c6fb9013ee8e26f337384d4924f6db8a21 (diff) | |
| download | frameworks_base-585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b.zip frameworks_base-585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b.tar.gz frameworks_base-585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b.tar.bz2 | |
resolved conflicts for merge of 4ea54f44 to master
Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 013dcb6..69e8f2e 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1201,33 +1201,10 @@ public class WifiStateMachine extends HierarchicalStateMachine { return; } // TODO - fix this for v6 - try { - mNetworkProperties.addAddress(InetAddress.getByAddress( - NetworkUtils.v4IntToArray(mDhcpInfo.ipAddress))); - } catch (UnknownHostException e) { - Log.e(TAG, "Exception setting IpAddress using " + mDhcpInfo + ", e=" + e); - } - - try { - mNetworkProperties.setGateway(InetAddress.getByAddress(NetworkUtils.v4IntToArray( - mDhcpInfo.gateway))); - } catch (UnknownHostException e) { - Log.e(TAG, "Exception setting Gateway using " + mDhcpInfo + ", e=" + e); - } - - try { - mNetworkProperties.addDns(InetAddress.getByAddress( - NetworkUtils.v4IntToArray(mDhcpInfo.dns1))); - } catch (UnknownHostException e) { - Log.e(TAG, "Exception setting Dns1 using " + mDhcpInfo + ", e=" + e); - } - try { - mNetworkProperties.addDns(InetAddress.getByAddress( - NetworkUtils.v4IntToArray(mDhcpInfo.dns2))); - - } catch (UnknownHostException e) { - Log.e(TAG, "Exception setting Dns2 using " + mDhcpInfo + ", e=" + e); - } + mNetworkProperties.addAddress(NetworkUtils.intToInetAddress(mDhcpInfo.ipAddress)); + mNetworkProperties.setGateway(NetworkUtils.intToInetAddress(mDhcpInfo.gateway)); + mNetworkProperties.addDns(NetworkUtils.intToInetAddress(mDhcpInfo.dns1)); + mNetworkProperties.addDns(NetworkUtils.intToInetAddress(mDhcpInfo.dns2)); // TODO - add proxy info } |