am 90bd9433: am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo

Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken

* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
  Dont start wifi if in airplane mode

services/java/com/android/server/WifiService.java

@@ -263,10 +263,13 @@ public class WifiService extends IWifiManager.Stub {
     /**
      * Check if Wi-Fi needs to be enabled and start
      * if needed
+     *
+     * This function is used only at boot time
      */
     public void startWifi() {
         /* Start if Wi-Fi is enabled or the saved state indicates Wi-Fi was on */
-        boolean wifiEnabled = getPersistedWifiEnabled() || testAndClearWifiSavedState();
+        boolean wifiEnabled = !isAirplaneModeOn()
+                && (getPersistedWifiEnabled() || testAndClearWifiSavedState());
         Slog.i(TAG, "WifiService starting up with Wi-Fi " +
                 (wifiEnabled ? "enabled" : "disabled"));
         setWifiEnabled(wifiEnabled);