railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: NPE in setEnterPictureInPictureOnLeave for unsupported Android versions (#4362)

Browse Source
This commit is contained in:
Joy 2025-01-10 20:07:25 +09:00 committed by GitHub
parent eff8ea24af
commit 3924b5e295
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/src/main/java/com/brentvatne/exoplayer/PictureInPictureUtil.kt
View File

@ -91,26 +91,26 @@ object PictureInPictureUtil {
@JvmStatic @JvmStatic
fun applyPlayingStatus( fun applyPlayingStatus(
context: ThemedReactContext, context: ThemedReactContext,
pipParamsBuilder: PictureInPictureParams.Builder, pipParamsBuilder: PictureInPictureParams.Builder?,
receiver: PictureInPictureReceiver, receiver: PictureInPictureReceiver,
isPaused: Boolean isPaused: Boolean
) { ) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return if (pipParamsBuilder == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
val actions = getPictureInPictureActions(context, isPaused, receiver) val actions = getPictureInPictureActions(context, isPaused, receiver)
pipParamsBuilder.setActions(actions) pipParamsBuilder.setActions(actions)
updatePictureInPictureActions(context, pipParamsBuilder.build()) updatePictureInPictureActions(context, pipParamsBuilder.build())
} }
@JvmStatic @JvmStatic
fun applyAutoEnterEnabled(context: ThemedReactContext, pipParamsBuilder: PictureInPictureParams.Builder, autoEnterEnabled: Boolean) { fun applyAutoEnterEnabled(context: ThemedReactContext, pipParamsBuilder: PictureInPictureParams.Builder?, autoEnterEnabled: Boolean) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return if (pipParamsBuilder == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return
pipParamsBuilder.setAutoEnterEnabled(autoEnterEnabled) pipParamsBuilder.setAutoEnterEnabled(autoEnterEnabled)
updatePictureInPictureActions(context, pipParamsBuilder.build()) updatePictureInPictureActions(context, pipParamsBuilder.build())
} }
@JvmStatic @JvmStatic
fun applySourceRectHint(context: ThemedReactContext, pipParamsBuilder: PictureInPictureParams.Builder, playerView: ExoPlayerView) { fun applySourceRectHint(context: ThemedReactContext, pipParamsBuilder: PictureInPictureParams.Builder?, playerView: ExoPlayerView) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return if (pipParamsBuilder == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
pipParamsBuilder.setSourceRectHint(calcRectHint(playerView)) pipParamsBuilder.setSourceRectHint(calcRectHint(playerView))
updatePictureInPictureActions(context, pipParamsBuilder.build()) updatePictureInPictureActions(context, pipParamsBuilder.build())
} }