Merge pull request #7340 from vingtetun/819947

Bug 819947 - No WiFi networks detected during FTU experience. Add more d...

apps/communications/ftu/js/tutorial.js

@@ -54,6 +54,7 @@ var Tutorial = {
 
     this.tutorialFinish.addEventListener('click', function ftuEnd() {
       self.tutorialFinish.removeEventListener('click', ftuEnd);
+      WifiManager.finish();
       window.close();
     });
     window.addEventListener('hashchange', this);

apps/communications/ftu/js/ui.js

@@ -82,6 +82,7 @@ var UIManager = {
     });
 
     this.skipTutorialButton.addEventListener('click', function() {
+      WifiManager.finish();
       window.close();
     });
     this.letsGoButton.addEventListener('click', function() {

apps/communications/ftu/js/wifi.js

@@ -6,6 +6,11 @@ var WifiManager = {
     if ('mozWifiManager' in window.navigator) {
       this.api = window.navigator.mozWifiManager;
       this.changeStatus();
+      // Ensure that wifi is on.
+      var lock = window.navigator.mozSettings.createLock();
+      this.enable(lock);
+      this.enableDebugging(lock);
+
       this.gCurrentNetwork = this.api.connection.network;
       if (this.gCurrentNetwork !== null) {
         this.api.forget(this.gCurrentNetwork);
@@ -76,9 +81,24 @@ var WifiManager = {
       callback(fakeNetworks);
     }
   },
-  enable: function wn_enable(firstTime) {
-    var settings = window.navigator.mozSettings;
-    settings.createLock().set({'wifi.enabled': true});
+  enable: function wn_enable(lock) {
+    lock.set({'wifi.enabled': true});
+  },
+  enableDebugging: function wn_enableDebugging(lock) {
+    // For bug 819947: turn on wifi debugging output to help track down a bug
+    // in wifi. We turn on wifi output only while the FTU app is active.
+    this._prevDebuggingValue = false;
+    var req = lock.get('wifi.debugging.enabled');
+    req.onsuccess = function wn_getDebuggingSuccess() {
+      this._prevDebuggingValue = req.result['wifi.debugging.enabled'];
+    };
+    lock.set({ 'wifi.debugging.enabled': true });
+  },
+  finish: function wn_finish() {
+    if (!this._prevDebuggingValue) {
+      var resetLock = window.navigator.mozSettings.createLock();
+      resetLock.set({'wifi.debugging.enabled': false});
+    }
   },
   getNetwork: function wm_gn(ssid) {
     var network;