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

* Fix surface null pointer exception * Add changeset * Call willNotProvideSurface when surface is null
livekit · Nov 26, 2024 · 4052700 · 4052700
1 parent 2237525
commit 4052700
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
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