From 367031b8aaeeabf579446e1d3279a78f4f953186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marin=CC=83o?= <daniel.marino@24imedia.com>
Date: Sun, 8 Sep 2019 08:32:51 +0200
Subject: [PATCH 01/11] 5.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7bcb784ef2..d4096f38f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-video",
-    "version": "5.0.1",
+    "version": "5.0.2",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 00b3eda39d5609a2bddced255f4d85de967be090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marin=CC=83o?= <daniel.marino@24imedia.com>
Date: Sun, 8 Sep 2019 09:00:37 +0200
Subject: [PATCH 02/11] fix readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9be9cc268e..d0a3de5ff8 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ Video only:
 
 ```diff
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-+  `pod 'react-native-video', :path => '../node_modules/react-native-video/react-native-video.podspec'`
++  `pod 'react-native-video', :podspec => '../node_modules/react-native-video/react-native-video.podspec'`
 end
 ```
 
@@ -85,7 +85,7 @@ Video with caching ([more info](docs/caching.md)):
 
 ```diff
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
-+  `pod 'react-native-video/VideoCaching', :path => '../node_modules/react-native-video/react-native-video.podspec'`
++  `pod 'react-native-video/VideoCaching', :podspec => '../node_modules/react-native-video/react-native-video.podspec'`
 end
 ```
 

From db9bc3f0d7e98f36828e6be0b1abe72820cfd54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Fri, 27 Sep 2019 14:35:24 +0200
Subject: [PATCH 03/11] Added a PIP support for Android

---
 .../exoplayer/ReactExoplayerView.java         | 58 ++++++++++++++++++-
 .../exoplayer/ReactExoplayerViewManager.java  |  6 ++
 .../exoplayer/VideoEventEmitter.java          | 10 ++++
 3 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 1edb8c7ac2..35b0ed36e9 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -2,11 +2,17 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.app.PictureInPictureParams;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -116,6 +122,7 @@ class ReactExoplayerView extends FrameLayout implements
     private boolean isInBackground;
     private boolean isPaused;
     private boolean isBuffering;
+    private boolean isInPictureInPictureMode;
     private float rate = 1f;
     private float audioVolume = 1f;
     private int minLoadRetryCount = 3;
@@ -184,6 +191,17 @@ public ReactExoplayerView(ThemedReactContext context) {
         themedReactContext.addLifecycleEventListener(this);
         audioBecomingNoisyReceiver = new AudioBecomingNoisyReceiver(themedReactContext);
 
+        BroadcastReceiver mReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                boolean isInPictureInPictureMode = intent.getBooleanExtra("isInPictureInPictureMode", false);
+                self.onPictureInPictureModeChanged(isInPictureInPictureMode);
+            }
+        };
+
+        Activity activity = themedReactContext.getCurrentActivity();
+        activity.registerReceiver(mReceiver, new IntentFilter("onPictureInPictureModeChanged"));
+
         initializePlayer();
     }
 
@@ -230,7 +248,7 @@ protected void onDetachedFromWindow() {
 
     @Override
     public void onHostResume() {
-        if (!playInBackground || !isInBackground) {
+        if (!playInBackground || !isInBackground || !isInPictureInPictureMode) {
             setPlayWhenReady(!isPaused);
         }
         isInBackground = false;
@@ -239,7 +257,7 @@ public void onHostResume() {
     @Override
     public void onHostPause() {
         isInBackground = true;
-        if (playInBackground) {
+        if (playInBackground || isInPictureInPictureMode) {
             return;
         }
         setPlayWhenReady(false);
@@ -1188,4 +1206,40 @@ public void setControls(boolean controls) {
             }
         }
     }
+
+    /**
+     * Handling pip prop.
+     *
+     * @param pictureInPicture  Pip prop, if true, enter PIP mode.
+     */
+    public void setPictureInPicture(boolean pictureInPicture) {
+        if (!isInPictureInPictureMode && pictureInPicture) {
+            this.enterPictureInPictureMode();
+        }
+        isInPictureInPictureMode = pictureInPicture;
+    }
+
+    /**
+     * PIP handled, for N devices that support it, not "officially".
+     */
+    public void enterPictureInPictureMode() {
+        PackageManager packageManager = themedReactContext.getPackageManager();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+                && packageManager
+                .hasSystemFeature(
+                        PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+            long videoPosition = player.getCurrentPosition();
+            Activity activity = themedReactContext.getCurrentActivity();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                PictureInPictureParams.Builder params = new PictureInPictureParams.Builder();
+                activity.enterPictureInPictureMode(params.build());
+            } else {
+                activity.enterPictureInPictureMode();
+            }
+        }
+    }
+
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+        eventEmitter.pictureInPictureModeChanged(isInPictureInPictureMode);
+    }
 }
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
index baa33075d5..414f51d891 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
@@ -59,6 +59,7 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi
     private static final String PROP_SELECTED_VIDEO_TRACK_VALUE = "value";
     private static final String PROP_HIDE_SHUTTER_VIEW = "hideShutterView";
     private static final String PROP_CONTROLS = "controls";
+    private static final String PROP_PICTURE_IN_PICTURE = "pictureInPicture";
 
     @Override
     public String getName() {
@@ -286,6 +287,11 @@ public void setBufferConfig(final ReactExoplayerView videoView, @Nullable Readab
         }
     }
 
+    @ReactProp(name = PROP_PICTURE_IN_PICTURE, defaultBoolean = false)
+    public void setPictureInPicture(final ReactExoplayerView videoView, final boolean pictureInPicture) {
+        videoView.setPictureInPicture(pictureInPicture);
+    }
+
     private boolean startsWithValidScheme(String uriString) {
         return uriString.startsWith("http://")
                 || uriString.startsWith("https://")
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
index 24d51e026f..1d32c1fb4b 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
@@ -46,6 +46,7 @@ class VideoEventEmitter {
     private static final String EVENT_AUDIO_BECOMING_NOISY = "onVideoAudioBecomingNoisy";
     private static final String EVENT_AUDIO_FOCUS_CHANGE = "onAudioFocusChanged";
     private static final String EVENT_PLAYBACK_RATE_CHANGE = "onPlaybackRateChange";
+    private static final String EVENT_PICTURE_IN_PICTURE_STATUS_CHANGED = "onPictureInPictureStatusChanged";
 
     static final String[] Events = {
             EVENT_LOAD_START,
@@ -68,6 +69,7 @@ class VideoEventEmitter {
             EVENT_AUDIO_FOCUS_CHANGE,
             EVENT_PLAYBACK_RATE_CHANGE,
             EVENT_BANDWIDTH,
+            EVENT_PICTURE_IN_PICTURE_STATUS_CHANGED
     };
 
     @Retention(RetentionPolicy.SOURCE)
@@ -92,6 +94,7 @@ class VideoEventEmitter {
             EVENT_AUDIO_FOCUS_CHANGE,
             EVENT_PLAYBACK_RATE_CHANGE,
             EVENT_BANDWIDTH,
+            EVENT_PICTURE_IN_PICTURE_STATUS_CHANGED
     })
     @interface VideoEvents {
     }
@@ -118,6 +121,7 @@ class VideoEventEmitter {
     private static final String EVENT_PROP_HAS_AUDIO_FOCUS = "hasAudioFocus";
     private static final String EVENT_PROP_IS_BUFFERING = "isBuffering";
     private static final String EVENT_PROP_PLAYBACK_RATE = "playbackRate";
+    private static final String EVENT_PROP_PICTURE_IN_PICTURE_ACTIVE = "isActive";
 
     private static final String EVENT_PROP_ERROR = "error";
     private static final String EVENT_PROP_ERROR_STRING = "errorString";
@@ -278,6 +282,12 @@ void audioBecomingNoisy() {
         receiveEvent(EVENT_AUDIO_BECOMING_NOISY, null);
     }
 
+    void pictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+        WritableMap map = Arguments.createMap();
+        map.putBoolean(EVENT_PROP_PICTURE_IN_PICTURE_ACTIVE, isInPictureInPictureMode);
+        receiveEvent(EVENT_PICTURE_IN_PICTURE_STATUS_CHANGED, map);
+    }
+
     private void receiveEvent(@VideoEvents String type, WritableMap event) {
         eventEmitter.receiveEvent(viewId, type, event);
     }

From d9fc9054d38bc71e8dd52babd4ac53fa23393a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Mon, 30 Sep 2019 11:55:26 +0200
Subject: [PATCH 04/11] Added another receiver

---
 .../exoplayer/ReactExoplayerView.java           | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 35b0ed36e9..48a4ba19a2 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -191,7 +191,9 @@ public ReactExoplayerView(ThemedReactContext context) {
         themedReactContext.addLifecycleEventListener(this);
         audioBecomingNoisyReceiver = new AudioBecomingNoisyReceiver(themedReactContext);
 
-        BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        ReactExoplayerView self = this;
+
+        BroadcastReceiver pipReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
                 boolean isInPictureInPictureMode = intent.getBooleanExtra("isInPictureInPictureMode", false);
@@ -199,8 +201,19 @@ public void onReceive(Context context, Intent intent) {
             }
         };
 
+        BroadcastReceiver leaveReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                self.setPictureInPicture(true);
+
+                // Manually call onHostResume to keep video playing.
+                self.onHostResume();
+            }
+        };
+
         Activity activity = themedReactContext.getCurrentActivity();
-        activity.registerReceiver(mReceiver, new IntentFilter("onPictureInPictureModeChanged"));
+        activity.registerReceiver(pipReceiver, new IntentFilter("onPictureInPictureModeChanged"));
+        activity.registerReceiver(leaveReceiver, new IntentFilter("onUserLeaveHint"));
 
         initializePlayer();
     }

From ebc7b1bc594518625432377a9d5805965a3b2757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Mon, 30 Sep 2019 12:24:00 +0200
Subject: [PATCH 05/11] Added mediaSession extension to enable PIP controls.

---
 android-exoplayer/build.gradle                            | 3 +++
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/android-exoplayer/build.gradle b/android-exoplayer/build.gradle
index 5baf953a22..407363d054 100644
--- a/android-exoplayer/build.gradle
+++ b/android-exoplayer/build.gradle
@@ -32,6 +32,9 @@ dependencies {
     implementation "androidx.core:core:1.0.0"
     implementation "androidx.media:media:1.0.0"
 
+    // MediaSession extension for PIP controls.
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.8.1'
+
     implementation('com.google.android.exoplayer:extension-okhttp:2.9.3') {
         exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 48a4ba19a2..708b9fcc3d 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -19,6 +19,7 @@
 import android.view.Window;
 import android.view.accessibility.CaptioningManager;
 import android.widget.FrameLayout;
+import android.support.v4.media.session.MediaSessionCompat;
 
 import com.brentvatne.react.R;
 import com.brentvatne.receiver.AudioBecomingNoisyReceiver;
@@ -71,6 +72,7 @@
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.ui.PlayerControlView;
+import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 
 import java.net.CookieHandler;
 import java.net.CookieManager;
@@ -425,6 +427,12 @@ public void run() {
                 initializePlayerControl();
                 setControls(controls);
                 applyModifiers();
+
+                //Use Media Session Connector from the ExoPlayer library to enable MediaSession Controls in PIP.
+                MediaSessionCompat mediaSession = new MediaSessionCompat(getContext(), "tag");
+                MediaSessionConnector mediaSessionConnector = new MediaSessionConnector(mediaSession);
+                mediaSessionConnector.setPlayer(player, null);
+                mediaSession.setActive(true);
             }
         }, 1);
     }

From 8312fa30f368f8dcf50c4ee1f70cf10f348b34c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Mon, 30 Sep 2019 12:51:13 +0200
Subject: [PATCH 06/11] ReadMe + changelog

---
 CHANGELOG.md |  2 ++
 README.md    | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5b8151055..efe414e1f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Changelog
 
+* Added PictureInPicture support for AndroidExoplayer API >= 28.
+
 ### Version 5.0.2
 * Fix crash when RCTVideo's superclass doesn't observe the keyPath 'frame' (iOS) [#1720](https://github.com/react-native-community/react-native-video/pull/1720)
 
diff --git a/README.md b/README.md
index d0a3de5ff8..17696fbbce 100644
--- a/README.md
+++ b/README.md
@@ -555,7 +555,38 @@ Determine whether the media should played as picture in picture.
 * **false (default)** - Don't not play as picture in picture
 * **true** - Play the media as picture in picture
 
-Platforms: iOS
+To use this feature on AndroidExoPlayer, you must:
+* Add following to the AndroidManifest.xml -> MainActivity:
+```
+  android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout"
+  android:resizeableActivity="true"
+  android:supportsPictureInPicture="true"
+```
+* [Enable PIP feature for you app](https://support.google.com/youtube/answer/7552722?co=GENIE.Platform%3DAndroid&hl=en) in your device settings
+* Add following methods to MainActivity:
+```
+    // To let JS knows about PIP mode change. 
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration?) {
+       super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+       val intent = Intent("onPictureInPictureModeChanged")
+       intent.putExtra("isInPictureInPictureMode", isInPictureInPictureMode)
+       this.sendBroadcast(intent)
+    }
+    
+    // To trigger PIP mode by pressing `Home` or `Recent` buttons
+    override fun onUserLeaveHint() {
+       val intent = Intent("onUserLeaveHint")
+       this.sendBroadcast(intent)
+       super.onUserLeaveHint()
+    }
+        
+    // To close and kill the app when closing PIP window.
+    override fun onStop() {
+       super.onStop()
+       finishAndRemoveTask()
+    }
+```
+Platforms: iOS, Android ExoPlayer
 
 #### playInBackground
 Determine whether the media should continue playing while the app is in the background. This allows customers to continue listening to the audio.

From 42f9803246ec66575a628042c3bb777cb5941341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Mon, 30 Sep 2019 13:05:58 +0200
Subject: [PATCH 07/11] readme change

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17696fbbce..81572610ee 100644
--- a/README.md
+++ b/README.md
@@ -1053,7 +1053,7 @@ isActive: true
 }
 ```
 
-Platforms:  iOS
+Platforms:  iOS, Android ExoPlayer (when following [this](#pictureinpicture) )
 
 #### onPlaybackRateChange
 Callback function that is called when the rate of playback changes - either paused or starts/resumes.

From 38e2e7a5f81b26d408926fde7c24bff459ca03c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Mon, 30 Sep 2019 14:47:58 +0200
Subject: [PATCH 08/11] Added PR link into the changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e087dfaceb..5e75d1b005 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ## Changelog
 
 ### next
-* Added PictureInPicture support for AndroidExoplayer API >= 28.
+* Added PictureInPicture support for AndroidExoplayer API >= 28. [#1776](https://github.com/react-native-community/react-native-video/pull/1776)
 
 ### Version 5.1.0-alpha1
 * Fixed Exoplayer doesn't work with mute=true (Android). [#1696](https://github.com/react-native-community/react-native-video/pull/1696)

From 8cc54f70ac344803dd33ab6279192580b3b2af41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Tue, 1 Oct 2019 12:29:44 +0200
Subject: [PATCH 09/11] Entering PIP mode on leave is now PROP driven +
 Unregistering receivers.

---
 README.md                                     |  8 +++++
 Video.js                                      |  1 +
 .../exoplayer/ReactExoplayerView.java         | 33 ++++++++++++++++---
 .../exoplayer/ReactExoplayerViewManager.java  |  6 ++++
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 60c06fd017..0ba43d78be 100644
--- a/README.md
+++ b/README.md
@@ -322,6 +322,7 @@ var styles = StyleSheet.create({
 * [selectedAudioTrack](#selectedaudiotrack)
 * [selectedTextTrack](#selectedtexttrack)
 * [selectedVideoTrack](#selectedvideotrack)
+* [showPictureInPictureOnLeave](#showpictureinpictureonleave)
 * [source](#source)
 * [stereoPan](#stereopan)
 * [textTracks](#texttracks)
@@ -764,6 +765,13 @@ If a track matching the specified Type (and Value if appropriate) is unavailable
 
 Platforms: Android ExoPlayer
 
+#### showPictureInPictureOnLeave
+Determine whether player should enter picture in picture mode while pressing Back or Recent hardware button.
+* **false (default)** - Don't not enter picture in picture on leave
+* **true** - Enter picture in picture on leave
+
+Platforms: Android ExoPlayer (when following [this](#pictureinpicture))
+
 #### source
 Sets the media source. You can pass an asset loaded via require or an object with a uri.
 
diff --git a/Video.js b/Video.js
index e5d56729e9..3e42a6119c 100644
--- a/Video.js
+++ b/Video.js
@@ -440,6 +440,7 @@ Video.propTypes = {
   fullscreenAutorotate: PropTypes.bool,
   fullscreenOrientation: PropTypes.oneOf(['all','landscape','portrait']),
   progressUpdateInterval: PropTypes.number,
+  showPictureInPictureOnLeave: PropTypes.bool,
   useTextureView: PropTypes.bool,
   hideShutterView: PropTypes.bool,
   onLoadStart: PropTypes.func,
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 31a0e88285..a6537ac5ab 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -98,6 +98,8 @@ class ReactExoplayerView extends FrameLayout implements
         DEFAULT_COOKIE_MANAGER.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
     }
 
+    private final BroadcastReceiver pipReceiver;
+    private final BroadcastReceiver leaveReceiver;
     private final VideoEventEmitter eventEmitter;
     private final ReactExoplayerConfig config;
     private final DefaultBandwidthMeter bandwidthMeter;
@@ -149,6 +151,7 @@ class ReactExoplayerView extends FrameLayout implements
     private Map<String, String> requestHeaders;
     private boolean mReportBandwidth = false;
     private boolean controls;
+    private boolean showPictureInPictureOnLeave;
     // \ End props
 
     // React
@@ -191,7 +194,7 @@ public ReactExoplayerView(ThemedReactContext context, ReactExoplayerConfig confi
 
         ReactExoplayerView self = this;
 
-        BroadcastReceiver pipReceiver = new BroadcastReceiver() {
+        pipReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
                 boolean isInPictureInPictureMode = intent.getBooleanExtra("isInPictureInPictureMode", false);
@@ -199,13 +202,15 @@ public void onReceive(Context context, Intent intent) {
             }
         };
 
-        BroadcastReceiver leaveReceiver = new BroadcastReceiver() {
+        leaveReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                self.setPictureInPicture(true);
+                if (showPictureInPictureOnLeave) {
+                    self.setPictureInPicture(true);
 
-                // Manually call onHostResume to keep video playing.
-                self.onHostResume();
+                    // Manually call onHostResume to keep video playing.
+                    self.onHostResume();
+                }
             }
         };
 
@@ -276,6 +281,15 @@ public void onHostPause() {
     @Override
     public void onHostDestroy() {
         stopPlayback();
+
+        Activity activity = themedReactContext.getCurrentActivity();
+        if (activity == null) return;
+        try {
+            activity.unregisterReceiver(pipReceiver);
+            activity.unregisterReceiver(leaveReceiver);
+        } catch (Exception ignore) {
+            // ignore if already unregistered
+        }
     }
 
     public void cleanUpResources() {
@@ -1253,6 +1267,15 @@ public void setControls(boolean controls) {
         }
     }
 
+    /**
+     * Handling showPictureInPictureOnLeave prop.
+     *
+     * @param showPictureInPictureOnLeaveProp If true, enter pip mode when pressing home or recent HW button.
+     */
+    public void setShowPictureInPictureOnLeave(boolean showPictureInPictureOnLeaveProp) {
+        showPictureInPictureOnLeave = showPictureInPictureOnLeaveProp;
+    }
+
     /**
      * Handling pip prop.
      *
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
index 58b94c56a7..3243c4a913 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
@@ -60,6 +60,7 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi
     private static final String PROP_HIDE_SHUTTER_VIEW = "hideShutterView";
     private static final String PROP_CONTROLS = "controls";
     private static final String PROP_PICTURE_IN_PICTURE = "pictureInPicture";
+    private static final String PROP_SHOW_PICTURE_IN_PICTURE_ON_LEAVE = "showPictureInPictureOnLeave";
 
     private ReactExoplayerConfig config;
 
@@ -298,6 +299,11 @@ public void setPictureInPicture(final ReactExoplayerView videoView, final boolea
         videoView.setPictureInPicture(pictureInPicture);
     }
 
+    @ReactProp(name = PROP_SHOW_PICTURE_IN_PICTURE_ON_LEAVE, defaultBoolean = false)
+    public void setShowPictureInPictureOnLeave(final ReactExoplayerView videoView, final boolean showPictureInPictureOnLeave) {
+        videoView.setShowPictureInPictureOnLeave(showPictureInPictureOnLeave);
+    }
+
     private boolean startsWithValidScheme(String uriString) {
         return uriString.startsWith("http://")
                 || uriString.startsWith("https://")

From 6833de763ece896594188a96ee9de8facf5b9472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Tue, 1 Oct 2019 22:26:00 +0200
Subject: [PATCH 10/11] A little fix of video resuming while entering pip mode.

---
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java  | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index a6537ac5ab..7f54c84ce4 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -207,9 +207,6 @@ public void onReceive(Context context, Intent intent) {
             public void onReceive(Context context, Intent intent) {
                 if (showPictureInPictureOnLeave) {
                     self.setPictureInPicture(true);
-
-                    // Manually call onHostResume to keep video playing.
-                    self.onHostResume();
                 }
             }
         };
@@ -263,7 +260,7 @@ protected void onDetachedFromWindow() {
 
     @Override
     public void onHostResume() {
-        if (!playInBackground || !isInBackground || !isInPictureInPictureMode) {
+        if (!playInBackground || !isInBackground) {
             setPlayWhenReady(!isPaused);
         }
         isInBackground = false;
@@ -272,7 +269,7 @@ public void onHostResume() {
     @Override
     public void onHostPause() {
         isInBackground = true;
-        if (playInBackground || isInPictureInPictureMode) {
+        if (playInBackground || showPictureInPictureOnLeave) {
             return;
         }
         setPlayWhenReady(false);

From 11ff5f4cbd5009565f96a263c369a78b45b6db7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Pol=C3=A1k?= <matpolak@seznam.cz>
Date: Wed, 2 Oct 2019 12:13:20 +0200
Subject: [PATCH 11/11] Removed mediaSession related things

---
 android-exoplayer/build.gradle                           | 3 ---
 .../com/brentvatne/exoplayer/ReactExoplayerView.java     | 9 ---------
 2 files changed, 12 deletions(-)

diff --git a/android-exoplayer/build.gradle b/android-exoplayer/build.gradle
index 8e408522e1..ce5c82fb08 100644
--- a/android-exoplayer/build.gradle
+++ b/android-exoplayer/build.gradle
@@ -37,7 +37,4 @@ dependencies {
     }
     implementation 'com.squareup.okhttp3:okhttp:3.14.3'
 
-    // MediaSession extension for PIP controls.
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.8.1'
-
 }
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 7f54c84ce4..962d8d497b 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -19,7 +19,6 @@
 import android.view.Window;
 import android.view.accessibility.CaptioningManager;
 import android.widget.FrameLayout;
-import android.support.v4.media.session.MediaSessionCompat;
 
 import com.brentvatne.react.R;
 import com.brentvatne.receiver.AudioBecomingNoisyReceiver;
@@ -69,8 +68,6 @@
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.util.Util;
-import com.google.android.exoplayer2.ui.PlayerControlView;
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 
 import java.net.CookieHandler;
 import java.net.CookieManager;
@@ -443,12 +440,6 @@ public void run() {
                 initializePlayerControl();
                 setControls(controls);
                 applyModifiers();
-
-                //Use Media Session Connector from the ExoPlayer library to enable MediaSession Controls in PIP.
-                MediaSessionCompat mediaSession = new MediaSessionCompat(getContext(), "tag");
-                MediaSessionConnector mediaSessionConnector = new MediaSessionConnector(mediaSession);
-                mediaSessionConnector.setPlayer(player, null);
-                mediaSession.setActive(true);
             }
         }, 1);
     }