Bug 1442763: Set correct flag for 'off by default in release' and onl…

…y send UT telemetry when general telemetry is sent. (#4017)
mozilla · Mar 5, 2018 · d4c5fa7 · d4c5fa7
1 parent 65e7add
commit d4c5fa7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/system-addon/lib/ActivityStream.jsm b/system-addon/lib/ActivityStream.jsm
@@ -118,7 +118,7 @@ const PREFS_CONFIG = new Map([
   }],
   ["telemetry.ut.events", {
     title: "Enable Unified Telemetry event data collection",
-    value: !AppConstants.RELEASE_OR_BETA,
+    value: AppConstants.EARLY_BETA_OR_EARLIER,
     value_local_dev: false
   }],
   ["telemetry.ping.endpoint", {

diff --git a/system-addon/lib/TelemetryFeed.jsm b/system-addon/lib/TelemetryFeed.jsm
@@ -360,7 +360,7 @@ this.TelemetryFeed = class TelemetryFeed {
   }
 
   sendUTEvent(event_object, eventFunction) {
-    if (this.eventTelemetryEnabled) {
+    if (this.telemetryEnabled && this.eventTelemetryEnabled) {
       eventFunction(event_object);
     }
   }

diff --git a/system-addon/test/unit/lib/TelemetryFeed.test.js b/system-addon/test/unit/lib/TelemetryFeed.test.js
@@ -478,6 +478,7 @@ describe("TelemetryFeed", () => {
   });
   describe("#sendUTEvent", () => {
     it("should call the UT event function passed in", async () => {
+      FakePrefs.prototype.prefs[TELEMETRY_PREF] = true;
       FakePrefs.prototype.prefs[EVENTS_TELEMETRY_PREF] = true;
       const event = {};
       instance = new TelemetryFeed();