From c797bda729dfd06da78dc799385787ebcfa9ea95 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Thu, 12 Oct 2017 15:29:12 +0200 Subject: [PATCH] Backed out changeset 506d96e0b240 (bug 1405299) --HG-- extra : rebase_source : 6f2e6c7cf26843d29b6f46aa96d3f8d00cb820be --- toolkit/components/telemetry/TelemetrySend.jsm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/toolkit/components/telemetry/TelemetrySend.jsm b/toolkit/components/telemetry/TelemetrySend.jsm index 328e5c4b46be..3c66fa2bbb6d 100644 --- a/toolkit/components/telemetry/TelemetrySend.jsm +++ b/toolkit/components/telemetry/TelemetrySend.jsm @@ -653,12 +653,12 @@ var TelemetrySendImpl = { this._log.trace("setup"); this._testMode = testing; + this._sendingEnabled = true; Services.obs.addObserver(this, TOPIC_IDLE_DAILY); Services.obs.addObserver(this, TOPIC_PROFILE_CHANGE_NET_TEARDOWN); this._server = Services.prefs.getStringPref(TelemetryUtils.Preferences.Server, undefined); - this._sendingEnabled = true; // Annotate crash reports so that crash pings are sent correctly and listen // to pref changes to adjust the annotations accordingly. @@ -797,10 +797,6 @@ var TelemetrySendImpl = { * Notify that we can start submitting data to the servers. */ notifyCanUpload() { - if (!this._sendingEnabled) { - this._log.trace("notifyCanUpload - notifying before sending is enabled. Ignoring."); - return Promise.resolve(); - } // Let the scheduler trigger sending pings if possible, also inform the // crash reporter that it can send crash pings if appropriate. SendScheduler.triggerSendingPings(true);