Fix dangling surfaces in ReactHostImpl

Kudo · May 2, 2024 · 18c5bb0 · 18c5bb0
1 parent 00b3661
commit 18c5bb0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java b/...ges/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java
@@ -1543,9 +1543,9 @@ private Task<Void> getOrCreateDestroyTask(final String reason, @Nullable Excepti
 
                     // Step 3: Stop all React Native surfaces
                     stopAttachedSurfaces(method, reactInstance);
-
-                    // TODO(T161461674): Should we clear mAttachedSurfaces?
-                    // Not clearing mAttachedSurfaces could lead to a memory leak.
+                    synchronized (mAttachedSurfaces) {
+                      mAttachedSurfaces.clear();
+                    }
 
                     return task;
                   },