From 8baaecd89c830d65aaeffe0b01931a7b0706ec47 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 5 Mar 2020 19:24:11 -0500
Subject: Issue #1470 - Part 2: Change calls from
 UpdateUtils.getUpdateChannel() to UpdateUtils.UpdateChannel in telemetry
 modules

---
 toolkit/components/telemetry/TelemetryController.jsm      | 2 +-
 toolkit/components/telemetry/TelemetryEnvironment.jsm     | 2 +-
 toolkit/components/telemetry/TelemetryReportingPolicy.jsm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'toolkit/components')

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;
-- 
cgit v1.2.3