always enable adb - mozcentral 20130819

always-enable-adb.patch

# HG changeset patch
# User Julien Wajsberg <[email protected]>
# Date 1376895042 -7200
# Node ID c223266e0b08f26268cc2158ba2971982bb67688
# Parent  8c1153bb921922d0eac533953f48b31189601c91
[mq]: force-adb

diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -60,17 +60,17 @@ var SettingsListener = {
   }
 };
 
 SettingsListener.init();
 
 // =================== Console ======================
 
 SettingsListener.observe('debug.console.enabled', true, function(value) {
-  Services.prefs.setBoolPref('consoleservice.enabled', value);
+  Services.prefs.setBoolPref('consoleservice.enabled', true);
   Services.prefs.setBoolPref('layout.css.report_errors', value);
 });
 
 // =================== Languages ====================
 SettingsListener.observe('language.current', 'en-US', function(value) {
   Services.prefs.setCharPref('general.useragent.locale', value);
 
   let prefName = 'intl.accept_languages';
@@ -325,16 +325,20 @@ let AdbController = {
         // we want adb enabled all of the time.
         enableAdb = true;
         useDisableAdbTimer = false;
       }
     } catch (e) {
       // This means that the pref doesn't exist. Which is fine. We just leave
       // enableAdb alone.
     }
+
+    enableAdb = true;
+    useDisableAdbTimer = false;
+
     if (this.DEBUG) {
       this.debug("updateState: enableAdb = " + enableAdb +
                  " remoteDebuggerEnabled = " + this.remoteDebuggerEnabled +
                  " lockEnabled = " + this.lockEnabled +
                  " locked = " + this.locked);
     }
 
     // Configure adb.