Merge change 24805 into eclair

* changes:
  Don't init wifiChannels until after supplicant up

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;
     }
 

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: