From e75835a2a581c6b00c99944763e6b97144fb3751 Mon Sep 17 00:00:00 2001 From: Kirk Steuber Date: Mon, 21 May 2018 14:48:47 -0700 Subject: [PATCH] Bug 1420514 - Remove app.update.enabled from prefs files r=rstrong MozReview-Commit-ID: 5pv8VFNYqKu --HG-- extra : rebase_source : 32dc323ce01c7d5a0a275d4e1a640a6fe495a1fa extra : source : e868b975027062043e1d94ad47b2ce63f4ecd793 --- browser/app/profile/firefox.js | 12 ++---------- mobile/android/app/mobile.js | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index a14f6a975cb1..9940233e7aad 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -125,13 +125,6 @@ pref("app.update.log", false); // the failure. pref("app.update.backgroundMaxErrors", 10); -// Whether or not app updates are enabled -#ifdef MOZ_UPDATER -pref("app.update.enabled", true); -#else -pref("app.update.enabled", false); -#endif - // Whether or not to use the doorhanger application update UI. pref("app.update.doorhanger", true); @@ -147,9 +140,8 @@ pref("app.update.download.promptMaxAttempts", 2); // download a fresh installer. pref("app.update.elevation.promptMaxAttempts", 2); -// If set to true, the Update Service will automatically download updates when -// app updates are enabled per the app.update.enabled preference and if the user -// can apply updates. +// If set to true, the Update Service will automatically download updates if the +// user can apply updates. pref("app.update.auto", true); // If set to true, the Update Service will present no UI for any event. diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index da17c535d693..521ebe7f14bd 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -488,7 +488,6 @@ pref("app.update.url.android", "https://aus5.mozilla.org/update/4/%PRODUCT%/%VER #ifdef MOZ_UPDATER /* prefs used specifically for updating the app */ -pref("app.update.enabled", false); pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@"); #endif