Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7648bd1f: Merge change Ibb5626c5 into eclair

Browse Source 
Merge commit '7648bd1f0005b869e87708b62442a8ad9884266a' into eclair-plus-aosp

* commit '7648bd1f0005b869e87708b62442a8ad9884266a':
  Stop bringing the wifi interface up on reset.
This commit is contained in:
Robert Greenwalt
2009-09-30 21:18:57 -07:00
committed by Android Git Automerger
parent 271fcd4ac9 7648bd1f00
commit 4fc99930a0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wifi/java/android/net/wifi/WifiStateTracker.java
View File

@@ -1237,9 +1237,9 @@ public class WifiStateTracker extends NetworkStateTracker {
/* /*
* Reset connection depends on both the interface and the IP assigned, * Reset connection depends on both the interface and the IP assigned,
* so it should be done before any chance of the IP being lost. * so it should be done before any chance of the IP being lost.
*/ */
NetworkUtils.resetConnections(mInterfaceName); NetworkUtils.resetConnections(mInterfaceName);
// Stop DHCP // Stop DHCP
if (mDhcpTarget != null) { if (mDhcpTarget != null) {
mDhcpTarget.setCancelCallback(true); mDhcpTarget.setCancelCallback(true);
@@ -1248,11 +1248,10 @@ public class WifiStateTracker extends NetworkStateTracker {
if (!NetworkUtils.stopDhcp(mInterfaceName)) { if (!NetworkUtils.stopDhcp(mInterfaceName)) {
Log.e(TAG, "Could not stop DHCP"); Log.e(TAG, "Could not stop DHCP");
} }
NetworkUtils.disableInterface(mInterfaceName); NetworkUtils.disableInterface(mInterfaceName);
if (reenable) { // we no longer net to start the interface (driver does this for us)
NetworkUtils.enableInterface(mInterfaceName); // and it led to problems - removed.
}
} }
/** /**