Issue #2320 - Address experiment options nits.

Author: liuche

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [4.0]
 ### Added
 - Various channels containing bundled links to various video-friendly websites (#2195)
+- Added options to choose experiments for QA (#2320)
 
 ## Fixed
 - Fixed a bug that caused Pocket onboarding to be shown to users that don't see Pocket content (#2293)

app/src/main/java/org/mozilla/tv/firefox/IntentValidator.kt

@@ -16,6 +16,8 @@ import org.mozilla.tv.firefox.ext.serviceLocator
 import org.mozilla.tv.firefox.telemetry.TelemetryIntegration
 import org.mozilla.tv.firefox.utils.UrlUtils
 
+private const val EXTRA_ACTIVE_EXPERIMENTS = "qaActiveExperiments"
+
 data class ValidatedIntentData(val url: String, val source: Session.Source)
 
 /**
@@ -29,7 +31,6 @@ data class ValidatedIntentData(val url: String, val source: Session.Source)
  */
 object IntentValidator {
     @VisibleForTesting const val DIAL_PARAMS_KEY = "com.amazon.extra.DIAL_PARAM"
-    private const val ACTIVE_EXPERIMENTS_KEY = "activeExperiments"
 
     /**
      * Validate that [intent] contains all expected parameters.
@@ -86,13 +87,12 @@ object IntentValidator {
     }
 
     private fun setExperimentOverrides(intent: SafeIntent, context: Context) {
-        intent.extras?.getStringArray(ACTIVE_EXPERIMENTS_KEY)?.let { strArray ->
-            val fretboard = context.serviceLocator.fretboardProvider.fretboard
-            fretboard.clearAllOverrides(context)
+        val experimentsArray = intent.extras?.getStringArray(EXTRA_ACTIVE_EXPERIMENTS) ?: return
+        val fretboard = context.serviceLocator.fretboardProvider.fretboard
+        fretboard.clearAllOverrides(context)
 
-            strArray.forEach {
-                fretboard.setOverride(context, ExperimentDescriptor(it), true)
-            }
+        experimentsArray.forEach {
+            fretboard.setOverride(context, ExperimentDescriptor(it), true)
         }
     }
 }

app/src/main/java/org/mozilla/tv/firefox/experiments/ExperimentsProvider.kt

@@ -68,8 +68,7 @@ class ExperimentsProvider(private val fretboard: Fretboard, private val context:
 
         val expDescriptor = checkBranchVariants(ExperimentConfig.TV_GUIDE_CHANNELS)
         return when {
-            // The user is currently not part of the experiment
-            expDescriptor == null -> false
+            expDescriptor == null -> false // Experiment unknown, or overridden to be false.
             expDescriptor.name.endsWith(ExperimentSuffix.A.value) -> false
             expDescriptor.name.endsWith(ExperimentSuffix.B.value) -> true
             else -> {