From b99d1b9a5550e11b62319ccaa04b6a6f56e354b7 Mon Sep 17 00:00:00 2001
From: tjroach <tjroach@amazon.com>
Date: Wed, 6 Aug 2025 09:44:02 -0400
Subject: [PATCH] Prevent crash on detachPreviewSurface is context is null

---
 .../amplifyframework/ui/liveness/camera/OpenGLRenderer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/liveness/src/main/java/com/amplifyframework/ui/liveness/camera/OpenGLRenderer.java b/liveness/src/main/java/com/amplifyframework/ui/liveness/camera/OpenGLRenderer.java
index bd84048f..3196ddfc 100644
--- a/liveness/src/main/java/com/amplifyframework/ui/liveness/camera/OpenGLRenderer.java
+++ b/liveness/src/main/java/com/amplifyframework/ui/liveness/camera/OpenGLRenderer.java
@@ -325,7 +325,11 @@ public ListenableFuture<Void> detachPreviewSurface() {
                 mExecutor.execute(
                         () -> {
                             if (!mIsShutdown) {
-                                setWindowSurface(mAdditionalContext, null);
+                                if (mAdditionalContext != 0) {
+                                    setWindowSurface(mAdditionalContext, null);
+                                } else if (DEBUG) {
+                                    Log.d(TAG, "!!! mAdditionalContext null during detachPreviewSurface");
+                                }
                                 mAdditionalTransformation.mSurfaceSize = null;
                             }
                             completer.set(null);