From 1ee0703bc30532ae7220eb6ce7f1848d701fbe51 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Mon, 4 Nov 2019 15:47:46 -0800
Subject: [PATCH] For #6441 - Only enable experiments for Beta/Prod

---
 app/src/main/java/org/mozilla/fenix/Config.kt              | 7 +++++++
 app/src/main/java/org/mozilla/fenix/FenixApplication.kt    | 2 +-
 .../java/org/mozilla/fenix/settings/DataChoicesFragment.kt | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/Config.kt b/app/src/main/java/org/mozilla/fenix/Config.kt
index 9ced6b1bd..2258246df 100644
--- a/app/src/main/java/org/mozilla/fenix/Config.kt
+++ b/app/src/main/java/org/mozilla/fenix/Config.kt
@@ -12,6 +12,13 @@ enum class ReleaseChannel {
             Debug -> false
             else -> true
         }
+
+    val isReleaseOrBeta: Boolean
+        get() = when (this) {
+            Production -> true
+            Beta -> true
+            else -> false
+        }
 }
 
 object Config {
diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index 8ec7bbcd9..cf7f8cdb3 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -82,7 +82,7 @@ open class FenixApplication : Application() {
         experimentLoader = loadExperiments()
 
         // Enable the service-experiments component
-        if (settings().isExperimentationEnabled) {
+        if (settings().isExperimentationEnabled && Config.channel.isReleaseOrBeta) {
             Experiments.initialize(
                 applicationContext,
                 mozilla.components.service.experiments.Configuration(
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
index bf4fb6b21..85d49bf5d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt
@@ -9,6 +9,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
+import org.mozilla.fenix.Config
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getPreferenceKey
@@ -66,6 +67,7 @@ class DataChoicesFragment : PreferenceFragmentCompat() {
 
         findPreference<SwitchPreference>(getPreferenceKey(R.string.pref_key_experimentation))?.apply {
             isChecked = context.settings().isExperimentationEnabled
+            isVisible = Config.channel.isReleaseOrBeta
             onPreferenceChangeListener = SharedPreferenceUpdater()
         }
     }