From 0e078d3f200c8f05fb7342f36d1c5c98e212896c Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Wed, 22 Apr 2020 14:11:12 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/2818 - Enable PiP for all
 builds

---
 .../main/java/org/mozilla/fenix/FeatureFlags.kt    |  5 -----
 .../mozilla/fenix/browser/BaseBrowserFragment.kt   | 14 ++++++--------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 14b23df858..12f8b8b539 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -39,11 +39,6 @@ object FeatureFlags {
      */
     const val webPushIntegration = true
 
-    /**
-     * Enables picture-in-picture feature
-     */
-    val pictureInPicture = Config.channel.isNightlyOrDebug
-
     /**
      * Enables tip feature
      */
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 8b54f406da..eefb46d439 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -327,14 +327,12 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
                 view = view
             )
 
-            if (FeatureFlags.pictureInPicture) {
-                pipFeature = PictureInPictureFeature(
-                    requireComponents.core.sessionManager,
-                    requireActivity(),
-                    customTabSessionId,
-                    ::pipModeChanged
-                )
-            }
+            pipFeature = PictureInPictureFeature(
+                requireComponents.core.sessionManager,
+                requireActivity(),
+                customTabSessionId,
+                ::pipModeChanged
+            )
 
             appLinksFeature.set(
                 feature = AppLinksFeature(