Merge remote-tracking branch 'origin/development' into PRN-145/fix-po…

…tential-infinite-stall
bitmovin · Nov 14, 2024 · 2d6efae · 2d6efae
2 parents 2cb3b0b + 0cfe9c5
commit 2d6efae
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,13 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Update Bitmovin's native Android SDK version to `3.92.0`
+
 ### Fixed
 
+- Error where setting `PlaybackConfig.isAutoplayEnabled = true` causes the player view creation to fail on Android
 - Potential infinite stall when using `NetworkConfig.preprocessHttpRequest` and `NetworkConfig.preprocessHttpResponse` on Android
 
 ## [0.31.0] - 2024-11-07

diff --git a/android/build.gradle b/android/build.gradle
@@ -105,6 +105,6 @@ dependencies {
     // Bitmovin
     implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.33.0'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
-    implementation 'com.bitmovin.player:player:3.91.0+jason'
-    implementation 'com.bitmovin.player:player-media-session:3.91.0+jason'
+    implementation 'com.bitmovin.player:player:3.92.0+jason'
+    implementation 'com.bitmovin.player:player-media-session:3.92.0+jason'
 }
diff --git a/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt b/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt
@@ -248,7 +248,7 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
             val playbackConfig = playerConfig?.getMap("playbackConfig")
             val isPictureInPictureEnabled = view.config?.pictureInPictureConfig?.isEnabled == true ||
                 playbackConfig?.getBooleanOrNull("isPictureInPictureEnabled") == true
-            view.enableBackgroundPlayback = playbackConfig?.getBoolean("isBackgroundPlaybackEnabled") ?: false
+            view.enableBackgroundPlayback = playbackConfig?.getBooleanOrNull("isBackgroundPlaybackEnabled") == true
 
             val rnStyleConfigWrapper = playerConfig?.toRNStyleConfigWrapperFromPlayerConfig()
             val configuredPlayerViewConfig = view.config?.playerViewConfig ?: PlayerViewConfig()

diff --git a/...oid/src/main/java/com/bitmovin/player/reactnative/services/MediaSessionPlaybackService.kt b/...oid/src/main/java/com/bitmovin/player/reactnative/services/MediaSessionPlaybackService.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Binder
 import android.os.IBinder
 import com.bitmovin.player.api.Player
+import com.bitmovin.player.api.media.session.ControllerInfo
 import com.bitmovin.player.api.media.session.MediaSession
 import com.bitmovin.player.api.media.session.MediaSessionService
 
@@ -29,7 +30,7 @@ class MediaSessionPlaybackService : MediaSessionService() {
     private val binder = ServiceBinder()
     private var mediaSession: MediaSession? = null
 
-    override fun onGetSession(): MediaSession? = null
+    override fun onGetSession(controllerInfo: ControllerInfo) = null
 
     override fun onDestroy() {
         disconnectSession()

diff --git a/integration_test/package.json b/integration_test/package.json
@@ -14,8 +14,8 @@
     "test:android": "yarn stop-test:android && yarn start-test:android",
     "test:ios": "yarn stop-test:ios && yarn start-test:ios",
     "pods": "yarn pods-install || yarn pods-update",
-    "pods-install": "NO_FLIPPER=1 yarn pod-install",
-    "pods-update": "cd ios && NO_FLIPPER=1 pod update --silent"
+    "pods-install": "[ \"$(uname)\" != Darwin ] || NO_FLIPPER=1 yarn pod-install",
+    "pods-update": "[ \"$(uname)\" != Darwin ] || cd ios && NO_FLIPPER=1 pod update --silent"
   },
   "dependencies": {
     "@types/react": "^18.0.0",