diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-03-06 15:05:51 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-03-06 15:05:51 -0500 |
| commit | b14d245a8a19e4ba1add25bda4598aa1b7c8d9fb (patch) | |
| tree | 63a64095021d86c02ff75df3c8840b59d82a57ec /toolkit/components/telemetry | |
| parent | 66ab2fa3dacaff7207d091dd2097328930fabedf (diff) | |
| parent | 4d80ed3d51cf10109600ba3fd6352193b58d28c8 (diff) | |
| download | UXP-b14d245a8a19e4ba1add25bda4598aa1b7c8d9fb.tar UXP-b14d245a8a19e4ba1add25bda4598aa1b7c8d9fb.tar.gz UXP-b14d245a8a19e4ba1add25bda4598aa1b7c8d9fb.tar.lz UXP-b14d245a8a19e4ba1add25bda4598aa1b7c8d9fb.tar.xz UXP-b14d245a8a19e4ba1add25bda4598aa1b7c8d9fb.zip | |
Merge branch 'updateutils-work'
Diffstat (limited to 'toolkit/components/telemetry')
| -rw-r--r-- | toolkit/components/telemetry/TelemetryController.jsm | 2 | ||||
| -rw-r--r-- | toolkit/components/telemetry/TelemetryEnvironment.jsm | 2 | ||||
| -rw-r--r-- | toolkit/components/telemetry/TelemetryReportingPolicy.jsm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/components/telemetry/TelemetryController.jsm b/toolkit/components/telemetry/TelemetryController.jsm index b8de776da..86de87d02 100644 --- a/toolkit/components/telemetry/TelemetryController.jsm +++ b/toolkit/components/telemetry/TelemetryController.jsm @@ -365,7 +365,7 @@ var Impl = { let updateChannel = null; try { - updateChannel = UpdateUtils.getUpdateChannel(false); + updateChannel = UpdateUtils.UpdateChannel; } catch (e) { this._log.trace("_getApplicationSection - Unable to get update channel.", e); } diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm index 391ea4bb4..f88dfc5f0 100644 --- a/toolkit/components/telemetry/TelemetryEnvironment.jsm +++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm @@ -1106,7 +1106,7 @@ EnvironmentCache.prototype = { _updateSettings: function () { let updateChannel = null; try { - updateChannel = UpdateUtils.getUpdateChannel(false); + updateChannel = UpdateUtils.UpdateChannel; } catch (e) {} this._currentEnvironment.settings = { diff --git a/toolkit/components/telemetry/TelemetryReportingPolicy.jsm b/toolkit/components/telemetry/TelemetryReportingPolicy.jsm index d9c99df49..6ad534f53 100644 --- a/toolkit/components/telemetry/TelemetryReportingPolicy.jsm +++ b/toolkit/components/telemetry/TelemetryReportingPolicy.jsm @@ -254,7 +254,7 @@ var TelemetryReportingPolicyImpl = { // use the general minimum policy version. let channel = ""; try { - channel = UpdateUtils.getUpdateChannel(false); + channel = UpdateUtils.UpdateChannel; } catch (e) { this._log.error("minimumPolicyVersion - Unable to retrieve the current channel."); return minPolicyVersion; |