From bce3451ac84e33a81a4bbb001b6c01774abe8818 Mon Sep 17 00:00:00 2001
From: Stanislav Parshin <s.a.parshin@gmail.com>
Date: Thu, 16 Jul 2020 23:06:04 +0800
Subject: [PATCH] Fix NullPointerException in FlutterTextView (#19501)

---
 .../io/flutter/embedding/android/FlutterTextureView.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java b/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
index 9750a291fcc..8c7aad1d217 100644
--- a/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
+++ b/shell/platform/android/io/flutter/embedding/android/FlutterTextureView.java
@@ -221,7 +221,9 @@ public class FlutterTextureView extends TextureView implements RenderSurface {
     }
 
     flutterRenderer.stopRenderingToSurface();
-    renderSurface.release();
-    renderSurface = null;
+    if (renderSurface != null) {
+      renderSurface.release();
+      renderSurface = null;
+    }
   }
 }