Fix race condition when reporting mounting transactions for deallocat…

…ed surfaces Summary: Changelog: [internal] This code is gated anyway so there's no harm in production. Differential Revision: D64322331
rubennorte · Oct 14, 2024 · 5b37072 · 5b37072
1 parent 60bc3c5
commit 5b37072
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...eactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt b/...eactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt
@@ -11,7 +11,6 @@ package com.facebook.react.defaults
 
 import com.facebook.react.common.annotations.VisibleForTesting
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
-import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlagsDefaults
 
 /**
  * A utility class that serves as an entry point for users setup the New Architecture.

diff --git a/...iveNewArchitectureFeatureFlagsDefaults.kt → ...iveNewArchitectureFeatureFlagsDefaults.kt b/...iveNewArchitectureFeatureFlagsDefaults.kt → ...iveNewArchitectureFeatureFlagsDefaults.kt
@@ -5,18 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-@file:Suppress("DEPRECATION") // We want to use ReactFeatureFlags here specifically
+package com.facebook.react.defaults
 
-package com.facebook.react.internal.featureflags
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsDefaults
 
 /**
  * This class initializes default values for ReactNativeFeatureFlags when the New architecture is
  * enabled. This class is meant to be overrode only by internal apps migrating to the new
  * architecture.
  *
- * NOTE: Be aware that as a side effect this class also modifies static fields in {@link
- * com.facebook.react.config.ReactFeatureFlags} when newArchitectureEnabled is true.
- *
  * When the new architecture is enabled, we want to set the default values of the flags for Fabric,
  * TurboModules and Bridgeless as enabled by default.
  */

diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp
@@ -121,7 +121,10 @@ void FabricUIManagerBinding::reportMount(SurfaceId surfaceId) {
         }
       }
       if (surfaceHandler != nullptr) {
-        surfaceHandler->getMountingCoordinator()->didPerformAsyncTransactions();
+        auto mountingCoordinator = surfaceHandler->getMountingCoordinator();
+        if (mountingCoordinator != nullptr) {
+          mountingCoordinator->didPerformAsyncTransactions();
+        }
       }
     } else {
       LOG(ERROR) << "FabricUIManagerBinding::reportMount: Surface with id "