From d6c47541d41f22c85bb6a6dbf3ddfdbf6410324f Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Wed, 9 Aug 2023 09:55:04 -0400
Subject: [PATCH] Fix null crash when using maintainVisibleContentPosition on
 Android

---
 .../views/scroll/MaintainVisibleScrollPositionHelper.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java
index f76c432b59047c..fff761feba26a2 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java
@@ -103,6 +103,10 @@ private void updateScrollPositionInternal() {
     }
 
     View firstVisibleView = mFirstVisibleView.get();
+    if (firstVisibleView == null) {
+      return;
+    }
+
     Rect newFrame = new Rect();
     firstVisibleView.getHitRect(newFrame);