Bug 1234153 - Hide block list feature behind Nightly flag. r=margaret

--HG--
extra : commitid : A5zLn6p7eiG
extra : rebase_source : 3cc998470c849d225cd29ba2eb6172b7a005524d

mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java

@@ -35,12 +35,7 @@ public class RestrictedProfileConfiguration implements RestrictionConfiguration
         configuration.put(Restrictable.ADVANCED_SETTINGS, false);
         configuration.put(Restrictable.CAMERA_MICROPHONE, false);
         configuration.put(Restrictable.DATA_CHOICES, false);
-
-        // Hold behind Nightly flag until we have an actual block list deployed.
-        if (AppConstants.NIGHTLY_BUILD) {
-            configuration.put(Restrictable.BLOCK_LIST, false);
-        }
-
+        configuration.put(Restrictable.BLOCK_LIST, false);
         configuration.put(Restrictable.TELEMETRY, false);
         configuration.put(Restrictable.HEALTH_REPORT, true);
         configuration.put(Restrictable.DEFAULT_THEME, true);
@@ -49,12 +44,18 @@ public class RestrictedProfileConfiguration implements RestrictionConfiguration
     /**
      * These restrictions are hidden from the admin configuration UI.
      */
-    private static List<Restrictable> hiddenRestrictions = Arrays.asList(
-            Restrictable.MASTER_PASSWORD,
-            Restrictable.GUEST_BROWSING,
-            Restrictable.DATA_CHOICES,
-            Restrictable.DEFAULT_THEME
-    );
+    private static List<Restrictable> hiddenRestrictions = new ArrayList<>();
+    static {
+        hiddenRestrictions.add(Restrictable.MASTER_PASSWORD);
+        hiddenRestrictions.add(Restrictable.GUEST_BROWSING);
+        hiddenRestrictions.add(Restrictable.DATA_CHOICES);
+        hiddenRestrictions.add(Restrictable.DEFAULT_THEME);
+
+        // Hold behind Nightly flag until we have an actual block list deployed.
+        if (!AppConstants.NIGHTLY_BUILD){
+            hiddenRestrictions.add(Restrictable.BLOCK_LIST);
+        }
+    }
 
     /* package-private */ static boolean shouldHide(Restrictable restrictable) {
         return hiddenRestrictions.contains(restrictable);