From bf4e229668c9e885736e8ec939961b85cdbb0141 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@meta.com>
Date: Tue, 21 Nov 2023 13:44:18 -0800
Subject: [PATCH] Clear mLastQueriedSurfaceMountingManager on stopSurface
 (#41590)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/41590

Causing a small leak while we wait for the surface to be fully destroyed.

Changelog: [Internal]

Reviewed By: fabriziocucci

Differential Revision: D51499256

fbshipit-source-id: 8f9e65898dcb9e0261502028874378ec9cc0f3fc
---
 .../com/facebook/react/fabric/mounting/MountingManager.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
index e65a01cd25e..3aa8c930349 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
@@ -143,9 +143,12 @@ public class MountingManager {
 
       surfaceMountingManager.stopSurface();
 
-      if (surfaceMountingManager == mMostRecentSurfaceMountingManager) {
+      if (mMostRecentSurfaceMountingManager == surfaceMountingManager) {
         mMostRecentSurfaceMountingManager = null;
       }
+      if (mLastQueriedSurfaceMountingManager == surfaceMountingManager) {
+        mLastQueriedSurfaceMountingManager = null;
+      }
     } else {
       ReactSoftExceptionLogger.logSoftException(
           TAG,