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

Merge change 24805 into eclair

Browse Source 
* changes:
  Don't init wifiChannels until after supplicant up
This commit is contained in:
Android (Google) Code Review
2009-09-11 21:08:38 -04:00
parent e441dcbb4e 7c9bf7caa2
commit f376c837ea
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/WifiService.java
View File

@@ -374,13 +374,6 @@ public class WifiService extends IWifiManager.Stub {
} }
setWifiEnabledState(eventualWifiState, uid); setWifiEnabledState(eventualWifiState, uid);
/*
* Initialize the number of allowed radio channels if Wi-Fi is being turned on.
*/
if (enable) {
mWifiStateTracker.setNumAllowedChannels();
}
return true; return true;
} }

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

@@ -784,6 +784,9 @@ public class WifiStateTracker extends NetworkStateTracker {
mBluetoothA2dp = new BluetoothA2dp(mContext); mBluetoothA2dp = new BluetoothA2dp(mContext);
} }
checkIsBluetoothPlaying(); checkIsBluetoothPlaying();
// initialize this after the supplicant is alive
setNumAllowedChannels();
break; break;
case EVENT_SUPPLICANT_DISCONNECT: case EVENT_SUPPLICANT_DISCONNECT: