From 3924b5e295ed64c97284f4665bc294066a83574a Mon Sep 17 00:00:00 2001 From: Joy Date: Fri, 10 Jan 2025 20:07:25 +0900 Subject: [PATCH] fix: NPE in setEnterPictureInPictureOnLeave for unsupported Android versions (#4362) --- .../com/brentvatne/exoplayer/PictureInPictureUtil.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/android/src/main/java/com/brentvatne/exoplayer/PictureInPictureUtil.kt b/android/src/main/java/com/brentvatne/exoplayer/PictureInPictureUtil.kt index 0dfbbc1a..1b965fa0 100644 --- a/android/src/main/java/com/brentvatne/exoplayer/PictureInPictureUtil.kt +++ b/android/src/main/java/com/brentvatne/exoplayer/PictureInPictureUtil.kt @@ -91,26 +91,26 @@ object PictureInPictureUtil { @JvmStatic fun applyPlayingStatus( context: ThemedReactContext, - pipParamsBuilder: PictureInPictureParams.Builder, + pipParamsBuilder: PictureInPictureParams.Builder?, receiver: PictureInPictureReceiver, 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) pipParamsBuilder.setActions(actions) updatePictureInPictureActions(context, pipParamsBuilder.build()) } @JvmStatic - fun applyAutoEnterEnabled(context: ThemedReactContext, pipParamsBuilder: PictureInPictureParams.Builder, autoEnterEnabled: Boolean) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return + fun applyAutoEnterEnabled(context: ThemedReactContext, pipParamsBuilder: PictureInPictureParams.Builder?, autoEnterEnabled: Boolean) { + if (pipParamsBuilder == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return pipParamsBuilder.setAutoEnterEnabled(autoEnterEnabled) updatePictureInPictureActions(context, pipParamsBuilder.build()) } @JvmStatic - fun applySourceRectHint(context: ThemedReactContext, pipParamsBuilder: PictureInPictureParams.Builder, playerView: ExoPlayerView) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return + fun applySourceRectHint(context: ThemedReactContext, pipParamsBuilder: PictureInPictureParams.Builder?, playerView: ExoPlayerView) { + if (pipParamsBuilder == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return pipParamsBuilder.setSourceRectHint(calcRectHint(playerView)) updatePictureInPictureActions(context, pipParamsBuilder.build()) }