Bug 1046127 - Don't drop adb connection during startup. r=fabrice
authorDave Hylands <dhylands@mozilla.com>
Mon, 11 Aug 2014 21:04:06 -0700
changeset 213336 332a663642b009a63bc77934c95660a74cd44a2a
parent 213335 ead7f6b96f357bf0be989199527f4ddfc5885295
child 213337 7f32109287e960466e70a5f856947c4fdfc4b926
push id6741
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:57:58 +0000
treeherdermozilla-aurora@aed50d3edf33 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs1046127
milestone34.0a1
Bug 1046127 - Don't drop adb connection during startup. r=fabrice
b2g/chrome/content/settings.js
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -457,20 +457,16 @@ SettingsListener.observe("lockscreen.ena
     // This preference is consulted during startup
     Services.prefs.savePrefFile(null);
     try {
       value ? USBRemoteDebugger.start() : USBRemoteDebugger.stop();
     } catch(e) {
       dump("Error while initializing USB devtools: "
            + e + "\n" + e.stack + "\n");
     }
-
-#ifdef MOZ_WIDGET_GONK
-    AdbController.setRemoteDebuggerState(value);
-#endif
   });
 
   SettingsListener.observe('debugger.remote-mode', 'disabled', function(value) {
     if (['disabled', 'adb-only', 'adb-devtools'].indexOf(value) == -1) {
       dump('Illegal value for debugger.remote-mode: ' + value + '\n');
       return;
     }