Bug 1551183: Part 1 - Add SCOPE_APPLICATION to enabledScopes for Fennec. r=aswan a=jcristau
☠☠ backed out by ed47966f7922 ☠ ☠
authorKris Maglione <maglione.k@gmail.com>
Wed, 22 May 2019 14:30:40 -0700
changeset 536626 868a040f89c3a5ccb7eca2a7cba219ff4088c4f7
parent 536625 75a98a0225b3c38bfd789e019b66e87a4b6c1199
child 536627 1878395be29ab4deace5ca3d3bdaee2cac1aa908
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaswan, jcristau
bugs1551183
milestone68.0
Bug 1551183: Part 1 - Add SCOPE_APPLICATION to enabledScopes for Fennec. r=aswan a=jcristau This scope now controls add-ons bundled in omni.ja as well as those in the app directory, so we need to enable it on Fennec in order for the default theme to work. Differential Revision: https://phabricator.services.mozilla.com/D32223
mobile/android/app/mobile.js
mobile/android/chrome/content/browser.js
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -186,17 +186,17 @@ pref("xpinstall.whitelist.add", "https:/
 
 pref("extensions.langpacks.signatures.required", true);
 pref("xpinstall.signatures.required", true);
 
 // Disable add-ons that are not installed by the user in all scopes by default (See the SCOPE
 // constants in AddonManager.jsm for values to use here, and Bug 1405528 for a rationale).
 pref("extensions.autoDisableScopes", 15);
 
-pref("extensions.enabledScopes", 1);
+pref("extensions.enabledScopes", 5);
 pref("extensions.autoupdate.enabled", true);
 pref("extensions.autoupdate.interval", 86400);
 pref("extensions.update.enabled", true);
 pref("extensions.update.interval", 86400);
 pref("extensions.dss.enabled", false);
 pref("extensions.ignoreMTimeChanges", false);
 pref("extensions.logging.enabled", false);
 pref("extensions.hideInstallButton", true);
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -461,17 +461,17 @@ var BrowserApp = {
     window.dispatchEvent(event);
 
     if (this._startupStatus) {
       this.onAppUpdated();
     }
 
     if (!ParentalControls.isAllowed(ParentalControls.INSTALL_EXTENSION)) {
       // Disable extension installs
-      Services.prefs.setIntPref("extensions.enabledScopes", 1);
+      Services.prefs.setIntPref("extensions.enabledScopes", 5);
       Services.prefs.setIntPref("extensions.autoDisableScopes", 1);
       Services.prefs.setBoolPref("xpinstall.enabled", false);
     } else if (ParentalControls.parentalControlsEnabled) {
       Services.prefs.clearUserPref("extensions.enabledScopes");
       Services.prefs.clearUserPref("extensions.autoDisableScopes");
       Services.prefs.setBoolPref("xpinstall.enabled", true);
     }