Merge branch 'rnv-master' into feature/handle-props-racing-conditions-on-expplayer

# Conflicts: # CHANGELOG.md
2019-07-09 11:39:30 +02:00
parent cb3cff7772 b7d1139326
commit cde2432804
14 changed files with 4130 additions and 2534 deletions
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -466,7 +466,7 @@ class ReactExoplayerView extends FrameLayout implements
    }

    private boolean requestAudioFocus() {
-        if (disableFocus) {
+        if (disableFocus || srcUri == null) {
            return true;
        }
        int result = audioManager.requestAudioFocus(this,