diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2012-11-09 10:52:27 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2012-11-16 11:25:32 -0800 |
| commit | 8058f621891b41c6864b6004c1c47647436a0ac1 (patch) | |
| tree | 6a5b9edef282dbe80890d1919d3930467379a358 /wifi | |
| parent | f89a5ef9e3ac0a9774eb8573f2a8ce69857a47e3 (diff) | |
| download | frameworks_base-8058f621891b41c6864b6004c1c47647436a0ac1.zip frameworks_base-8058f621891b41c6864b6004c1c47647436a0ac1.tar.gz frameworks_base-8058f621891b41c6864b6004c1c47647436a0ac1.tar.bz2 | |
Support for dns domain.
bug:6799630
Change-Id: I10070eddb65b7b60f0bc2b3e1e320e1aa4ec6e98
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index b6fcbd1..44b2eac 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1805,6 +1805,12 @@ public class WifiStateMachine extends StateMachine { private void handleSuccessfulIpConfiguration(DhcpResults dhcpResults) { mLastSignalLevel = -1; // force update of signal strength mReconnectCount = 0; //Reset IP failure tracking + if (dhcpResults.serverAddress == null) { + dhcpResults = null; + } + synchronized (mDhcpResultsLock) { + mDhcpResults = dhcpResults; + } LinkProperties linkProperties = dhcpResults.linkProperties; mWifiConfigStore.setLinkProperties(mLastNetworkId, linkProperties); InetAddress addr = null; @@ -1826,7 +1832,6 @@ public class WifiStateMachine extends StateMachine { sendLinkConfigurationChangedBroadcast(); } } else { - mLinkProperties = linkProperties; configureLinkProperties(); } } |