summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2009-09-30 20:01:12 -0700
committerRobert Greenwalt <robdroid@android.com>2009-09-30 20:01:12 -0700
commitbb5626c569bb9ccedd7b7d4197a2dace4c997c49 (patch)
treece07161d0301a145cfb34e6a19273bb5493f3982 /wifi
parent6988dd59680ba4ec67c0e6ad14444e4763af8d01 (diff)
downloadframeworks_base-bb5626c569bb9ccedd7b7d4197a2dace4c997c49.zip
frameworks_base-bb5626c569bb9ccedd7b7d4197a2dace4c997c49.tar.gz
frameworks_base-bb5626c569bb9ccedd7b7d4197a2dace4c997c49.tar.bz2
Stop bringing the wifi interface up on reset.
The driver will bring up the interface when needed and bring it up at reset time has caused some problems. bug: 2144870
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiStateTracker.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index 5638480..2c0d0f1 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -1237,9 +1237,9 @@ public class WifiStateTracker extends NetworkStateTracker {
/*
* Reset connection depends on both the interface and the IP assigned,
* so it should be done before any chance of the IP being lost.
- */
+ */
NetworkUtils.resetConnections(mInterfaceName);
-
+
// Stop DHCP
if (mDhcpTarget != null) {
mDhcpTarget.setCancelCallback(true);
@@ -1248,11 +1248,10 @@ public class WifiStateTracker extends NetworkStateTracker {
if (!NetworkUtils.stopDhcp(mInterfaceName)) {
Log.e(TAG, "Could not stop DHCP");
}
-
+
NetworkUtils.disableInterface(mInterfaceName);
- if (reenable) {
- NetworkUtils.enableInterface(mInterfaceName);
- }
+ // we no longer net to start the interface (driver does this for us)
+ // and it led to problems - removed.
}
/**