diff options
| author | 2009-09-11 21:08:38 -0400 | |
|---|---|---|
| committer | 2009-09-11 21:08:38 -0400 | |
| commit | f376c837ea9d5b89c668ff8306f2a404bed4ff05 (patch) | |
| tree | 80765f765790ddbceb6b8d13021fda0545aaf029 | |
| parent | e441dcbb4ed197cf248420308f5eaa935333651e (diff) | |
| parent | 7c9bf7caa2936e8b76598be9fffea980d81c61d3 (diff) | |
Merge change 24805 into eclair
* changes:
Don't init wifiChannels until after supplicant up
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 7 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 6e6f66fbdc5e..53ff78e6160b 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -374,13 +374,6 @@ public class WifiService extends IWifiManager.Stub { } setWifiEnabledState(eventualWifiState, uid); - /* - * Initialize the number of allowed radio channels if Wi-Fi is being turned on. - */ - if (enable) { - mWifiStateTracker.setNumAllowedChannels(); - } - return true; } diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index fa24a98320d5..9a1140487ef7 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -784,6 +784,9 @@ public class WifiStateTracker extends NetworkStateTracker { mBluetoothA2dp = new BluetoothA2dp(mContext); } checkIsBluetoothPlaying(); + + // initialize this after the supplicant is alive + setNumAllowedChannels(); break; case EVENT_SUPPLICANT_DISCONNECT: |