summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorNew Tobin Paradigm <email@mattatobin.com>2019-07-08 00:24:11 -0400
committerGitHub <noreply@github.com>2019-07-08 00:24:11 -0400
commit4b4d3a9cca870681e1187794f951808c10274dd3 (patch)
tree20d5d257550121c1f90b098a7bac363871c5980c /toolkit
parent20e3587ef5a97f190da7a4e674e988d7189c795c (diff)
parent24ad244d47034b36e433797914718baaffa5dada (diff)
downloadUXP-4b4d3a9cca870681e1187794f951808c10274dd3.tar
UXP-4b4d3a9cca870681e1187794f951808c10274dd3.tar.gz
UXP-4b4d3a9cca870681e1187794f951808c10274dd3.tar.lz
UXP-4b4d3a9cca870681e1187794f951808c10274dd3.tar.xz
UXP-4b4d3a9cca870681e1187794f951808c10274dd3.zip
Merge pull request #1164 from g4jc/hotfix-removal
Issue #1160 - Remove unused HotFix preferences
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/components/telemetry/TelemetryEnvironment.jsm2
-rw-r--r--toolkit/components/telemetry/docs/data/environment.rst1
-rw-r--r--toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js8
3 files changed, 1 insertions, 10 deletions
diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm
index 295679ca4..391ea4bb4 100644
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -196,7 +196,6 @@ const PREF_DISTRIBUTION_ID = "distribution.id";
const PREF_DISTRIBUTION_VERSION = "distribution.version";
const PREF_DISTRIBUTOR = "app.distributor";
const PREF_DISTRIBUTOR_CHANNEL = "app.distributor.channel";
-const PREF_HOTFIX_LASTVERSION = "extensions.hotfix.lastVersion";
const PREF_APP_PARTNER_BRANCH = "app.partner.";
const PREF_PARTNER_ID = "mozilla.partner.id";
const PREF_UPDATE_ENABLED = "app.update.enabled";
@@ -1050,7 +1049,6 @@ EnvironmentCache.prototype = {
vendor: Services.appinfo.vendor || null,
platformVersion: Services.appinfo.platformVersion || null,
xpcomAbi: Services.appinfo.XPCOMABI,
- hotfixVersion: Preferences.get(PREF_HOTFIX_LASTVERSION, null),
};
// Add |architecturesInBinary| only for Mac Universal builds.
diff --git a/toolkit/components/telemetry/docs/data/environment.rst b/toolkit/components/telemetry/docs/data/environment.rst
index ff0d204a4..0c259fa85 100644
--- a/toolkit/components/telemetry/docs/data/environment.rst
+++ b/toolkit/components/telemetry/docs/data/environment.rst
@@ -31,7 +31,6 @@ Structure:
vendor: <string>, // e.g. "Mozilla"
platformVersion: <string>, // e.g. "35.0"
xpcomAbi: <string>, // e.g. "x86-msvc"
- hotfixVersion: <string>, // e.g. "20141211.01"
},
settings: {
addonCompatibilityCheckEnabled: <bool>, // Whether application compatibility is respected for add-ons
diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
index 35181272a..2518a80ba 100644
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
@@ -33,7 +33,6 @@ const PLATFORM_VERSION = "1.9.2";
const APP_VERSION = "1";
const APP_ID = "xpcshell@tests.mozilla.org";
const APP_NAME = "XPCShell";
-const APP_HOTFIX_VERSION = "2.3.4a";
const DISTRIBUTION_ID = "distributor-id";
const DISTRIBUTION_VERSION = "4.5.6b";
@@ -385,10 +384,8 @@ function checkBuildSection(data) {
Assert.equal(data.build[f], expectedInfo[f], f + " must have the correct value.");
}
- // Make sure architecture and hotfixVersion are in the environment.
+ // Make sure architecture is in the environment.
Assert.ok(checkString(data.build.architecture));
- Assert.ok(checkString(data.build.hotfixVersion));
- Assert.equal(data.build.hotfixVersion, APP_HOTFIX_VERSION);
if (gIsMac) {
let macUtils = Cc["@mozilla.org/xpcom/mac-utils;1"].getService(Ci.nsIMacUtils);
@@ -830,9 +827,6 @@ add_task(function* setup() {
gHttpServer.registerDirectory("/data/", do_get_cwd());
do_register_cleanup(() => gHttpServer.stop(() => {}));
- // Spoof the the hotfixVersion
- Preferences.set("extensions.hotfix.lastVersion", APP_HOTFIX_VERSION);
-
// Create the attribution data file, so that settings.attribution will exist.
// The attribution functionality only exists in Firefox.
if (AppConstants.MOZ_BUILD_APP == "browser") {