Bug 1034489 - [FirefoxOS_v1.4][Shark]Close WIFI while obtaining IP from AP and WIFI button can't be tapped for long. r=chulee

dom/wifi/WifiWorker.js

@@ -1049,6 +1049,7 @@ var WifiManager = (function() {
         manager.stopSupplicantCallback = (function () {
           wifiCommand.stopSupplicant(function (status) {
             wifiCommand.closeSupplicantConnection(function() {
+              manager.connectToSupplicant = false;
               manager.state = "UNINITIALIZED";
               netUtil.disableInterface(manager.ifname, function (ok) {
                 unloadDriver(WIFI_FIRMWARE_STATION, callback);
@@ -1062,6 +1063,11 @@ var WifiManager = (function() {
         }).bind(this);
         createWaitForTerminateEventTimer(terminateEventCallback);
 
+        // We are going to terminate the connection between wpa_supplicant.
+        // Stop the polling timer immediately to prevent connection info update
+        // command blocking in control thread until socket timeout.
+        notify("stopconnectioninfotimer");
+
         wifiCommand.terminateSupplicant(function (ok) {
           manager.connectionDropped(function () {
           });
@@ -2329,6 +2335,10 @@ function WifiWorker() {
     self._fireEvent("stationinfoupdate", { station: this.station });
   };
 
+  WifiManager.onstopconnectioninfotimer = function() {
+    self._stopConnectionInfoTimer();
+  };
+
   // Read the 'wifi.enabled' setting in order to start with a known
   // value at boot time. The handle() will be called after reading.
   //