Fix surface causing null pointer exception on some devices (#544)

KasemJaffer · web-flow · commit 4052700b9fae · 2024-11-25T21:34:01.000-08:00
* Fix surface null pointer exception

* Add changeset

* Call willNotProvideSurface when surface is null
diff --git a/.changeset/small-beds-add.md b/.changeset/small-beds-add.md
@@ -0,0 +1,5 @@
+---
+"client-sdk-android": patch
+---
+
+Fix surface causing null pointer exception on some devices
diff --git a/livekit-android-camerax/src/main/java/livekit/org/webrtc/CameraXSession.kt b/livekit-android-camerax/src/main/java/livekit/org/webrtc/CameraXSession.kt
@@ -149,7 +149,9 @@ internal constructor(
 
                 surface = Surface(surfaceTextureHelper.surfaceTexture)
                 surfaceProvider = SurfaceProvider { request ->
-                    request.provideSurface(surface!!, helperExecutor) { }
+                    surface?.let {
+                        request.provideSurface(it, helperExecutor) { }
+                    } ?: request.willNotProvideSurface()
                 }
 
                 // Set image analysis - camera params

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"client-sdk-android": patch
 +---
++
 +Fix surface causing null pointer exception on some devices
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,9 @@ internal constructor(`
`149`	`149`
`150`	`150`	`surface = Surface(surfaceTextureHelper.surfaceTexture)`
`151`	`151`	`surfaceProvider = SurfaceProvider { request ->`
`152`		`- request.provideSurface(surface!!, helperExecutor) { }`
	`152`	`+ surface?.let {`
	`153`	`+ request.provideSurface(it, helperExecutor) { }`
	`154`	`+ } ?: request.willNotProvideSurface()`
`153`	`155`	`}`
`154`	`156`
`155`	`157`	`// Set image analysis - camera params`