Bug 798028 - NetworkStatsService.jsm is not available in non-RIL builds [r=marshall]
authorFabrice Desré <fabrice@mozilla.com>
Thu, 04 Oct 2012 14:19:05 -0700
changeset 109290 42c2104c0a2719f44d8269edea1af21e18a44d24
parent 109289 f0ce5a01e4fcb24ba570c41b969b675c5396d543
child 109291 049c17d2954c0b01706cc1ee82d256c8c098461c
push id23619
push useremorley@mozilla.com
push dateFri, 05 Oct 2012 10:54:02 +0000
treeherdermozilla-central@3b458f4e0f42 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarshall
bugs798028
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 798028 - NetworkStatsService.jsm is not available in non-RIL builds [r=marshall]
b2g/app/b2g.js
b2g/chrome/content/shell.js
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -391,17 +391,19 @@ pref("dom.sms.strict7BitEncoding", false
 
 // Temporary permission hack for WebContacts
 pref("dom.mozContacts.enabled", true);
 
 // WebAlarms
 pref("dom.mozAlarms.enabled", true);
 
 // NetworkStats
+#ifdef MOZ_B2G_RIL
 pref("dom.mozNetworkStats.enabled", true);
+#endif
 
 // WebSettings
 pref("dom.mozSettings.enabled", true);
 pref("dom.mozPermissionSettings.enabled", true);
 
 // controls if we want camera support
 pref("device.camera.enabled", true);
 pref("media.realtime_decoder.enabled", true);
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -20,17 +20,19 @@ Cu.import('resource://gre/modules/AlarmS
 Cu.import('resource://gre/modules/ActivitiesService.jsm');
 Cu.import('resource://gre/modules/PermissionPromptHelper.jsm');
 Cu.import('resource://gre/modules/PermissionSettings.jsm');
 Cu.import('resource://gre/modules/ObjectWrapper.jsm');
 Cu.import('resource://gre/modules/accessibility/AccessFu.jsm');
 Cu.import('resource://gre/modules/Payment.jsm');
 Cu.import("resource://gre/modules/AppsUtils.jsm");
 Cu.import('resource://gre/modules/UserAgentOverrides.jsm');
+#ifdef MOZ_B2G_RIL
 Cu.import('resource://gre/modules/NetworkStatsService.jsm');
+#endif
 
 XPCOMUtils.defineLazyServiceGetter(Services, 'env',
                                    '@mozilla.org/process/environment;1',
                                    'nsIEnvironment');
 
 XPCOMUtils.defineLazyServiceGetter(Services, 'ss',
                                    '@mozilla.org/content/style-sheet-service;1',
                                    'nsIStyleSheetService');