Issue 6188 - Add-ons option is being shown

mobile/android/base/java/org/mozilla/gecko/BrowserApp.java

Index: mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
===================================================================
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3712,17 +3712,18 @@ public class BrowserApp extends GeckoApp
         if (SwitchBoard.isInExperiment(this, Experiments.TOP_ADDONS_MENU)) {
             MenuUtils.safeSetVisible(aMenu, R.id.addons_top_level, true);
             MenuUtils.safeSetVisible(aMenu, R.id.addons, false);
         } else {
             MenuUtils.safeSetVisible(aMenu, R.id.addons_top_level, false);
             MenuUtils.safeSetVisible(aMenu, R.id.addons, true);
         }
 
-        if (!Restrictions.isAllowed(this, Restrictable.INSTALL_EXTENSION)) {
+        // Always hiding add-ons. See https://issues.adblockplus.org/ticket/6188
+        if (true) {
             MenuUtils.safeSetVisible(aMenu, R.id.addons, false);
             MenuUtils.safeSetVisible(aMenu, R.id.addons_top_level, false);
         }
 
         // Hide panel menu items if the panels themselves are hidden.
         // If we don't know whether the panels are hidden, just show the menu items.
         bookmarksList.setVisible(prefs.getBoolean(HomeConfig.PREF_KEY_BOOKMARKS_PANEL_ENABLED, true));
         historyList.setVisible(prefs.getBoolean(HomeConfig.PREF_KEY_HISTORY_PANEL_ENABLED, true));