Bug 1420514 - Remove app.update.enabled from prefs files draft
authorKirk Steuber <ksteuber@mozilla.com>
Mon, 21 May 2018 14:48:47 -0700
changeset 817889 a8bb80ce5a276fe54100b0e05fe2bba12513cad4
parent 817669 e951f4ad123aa87d1d392c286db14cabb41a8560
child 817890 e39e19b0e6caa33594c81a2e2b9610b15faa0e98
child 818952 28bfc6deb9ec13e126f40b65452fed7a37bfb2dc
push id116208
push userbmo:ksteuber@mozilla.com
push dateFri, 13 Jul 2018 17:09:51 +0000
bugs1420514
milestone63.0a1
Bug 1420514 - Remove app.update.enabled from prefs files MozReview-Commit-ID: 5pv8VFNYqKu
browser/app/profile/firefox.js
mobile/android/app/mobile.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -118,41 +118,33 @@ pref("app.update.altwindowtype", "Browse
 // Enables some extra Application Update Logging (can reduce performance)
 pref("app.update.log", false);
 
 // The number of general background check failures to allow before notifying the
 // user of the failure. User initiated update checks always notify the user of
 // 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);
 
 // Ids of the links to the "What's new" update documentation
 pref("app.update.link.updateAvailableWhatsNew", "update-available-whats-new");
 pref("app.update.link.updateManualWhatsNew", "update-manual-whats-new");
 
 // How many times we should let downloads fail before prompting the user to
 // download a fresh installer.
 pref("app.update.download.promptMaxAttempts", 2);
 
 // How many times we should let an elevation prompt fail before prompting the user to
 // 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.
 pref("app.update.silent", false);
 
 // app.update.badgeWaitTime is in branding section
 
 // If set to true, the Update Service will apply updates in the background
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -483,17 +483,16 @@ pref("app.update.timerMinimumDelay", 30)
 
 // used by update service to decide whether or not to
 // automatically download an update
 pref("app.update.autodownload", "wifi");
 pref("app.update.url.android", "https://aus5.mozilla.org/update/4/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%MOZ_VERSION%/update.xml");
 
 #ifdef MOZ_UPDATER
 /* prefs used specifically for updating the app */
-pref("app.update.enabled", false);
 pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");
 
 #endif
 
 // replace newlines with spaces on paste into single-line text boxes
 pref("editor.singleLine.pasteNewlines", 2);
 
 // threshold where a tap becomes a drag, in 1/240" reference pixels