Backed out changeset eba1f5d0a908 (bug 864395) for Gaia integration test failures.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-04-29 21:41:03 -04:00
parent c19c31b369
commit 131f90f696

View File

@ -632,33 +632,6 @@ SettingsListener.observe('apz.displayport.heuristics', 'default', function(value
}
});
// =================== Telemetry ======================
(function setupTelemetrySettings() {
let gaiaSettingName = 'debug.performance_data.shared';
let geckoPrefName = 'toolkit.telemetry.enabled';
SettingsListener.observe(gaiaSettingName, null, function(value) {
if (value !== null) {
// Gaia setting has been set; update Gecko pref to that.
Services.prefs.setBoolPref(geckoPrefName, value);
return;
}
// Gaia setting has not been set; set the gaia setting to default.
#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
let prefValue = true;
#else
let prefValue = false;
#endif
try {
prefValue = Services.prefs.getBoolPref(geckoPrefName);
} catch (e) {
// Pref not set; use default value.
}
let setting = {};
setting[gaiaSettingName] = prefValue;
window.navigator.mozSettings.createLock().set(setting);
});
})();
// =================== Various simple mapping ======================
let settingsToObserve = {
'ril.mms.retrieval_mode': {