From d502380b91cddf5ef6879f15e487013c2833a87f Mon Sep 17 00:00:00 2001
From: Phillip Pan <phillippan@meta.com>
Date: Mon, 13 Nov 2023 20:58:16 -0800
Subject: [PATCH] pass down sync void config to jsi module (#41470)

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

Changelog: [Internal]

actually pass down the config value -_-

Reviewed By: christophpurrer

Differential Revision: D51279435

fbshipit-source-id: 674d7558a30742f6bf67cacfb4025e3c7d3646f7
---
 .../turbomodule/ReactCommon/TurboModuleManager.cpp    | 11 ++++++-----
 .../turbomodule/ReactCommon/TurboModuleManager.h      |  3 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp
index 293ba705abd..85a2fdab53b 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp
@@ -135,7 +135,8 @@ TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
           nativeMethodCallInvoker_ =
               std::weak_ptr<NativeMethodCallInvoker>(nativeMethodCallInvoker_),
           delegate_ = jni::make_weak(delegate_),
-          javaPart_ = jni::make_weak(javaPart_)](
+          javaPart_ = jni::make_weak(javaPart_),
+          enableSyncVoidMethods](
              const std::string& name) -> std::shared_ptr<TurboModule> {
     auto turboModuleCache = turboModuleCache_.lock();
     auto jsCallInvoker = jsCallInvoker_.lock();
@@ -197,7 +198,7 @@ TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
           .instance = moduleInstance,
           .jsInvoker = jsCallInvoker,
           .nativeMethodCallInvoker = nativeMethodCallInvoker,
-          .shouldVoidMethodsExecuteSync = false};
+          .shouldVoidMethodsExecuteSync = enableSyncVoidMethods};
 
       auto turboModule = delegate->cthis()->getTurboModule(name, params);
       turboModuleCache->insert({name, turboModule});
@@ -209,8 +210,8 @@ TurboModuleProviderFunctionType TurboModuleManager::createTurboModuleProvider(
   };
 }
 
-TurboModuleProviderFunctionType TurboModuleManager::createLegacyModuleProvider(
-    bool enableSyncVoidMethods) {
+TurboModuleProviderFunctionType
+TurboModuleManager::createLegacyModuleProvider() {
   return [legacyModuleCache_ = std::weak_ptr<ModuleCache>(legacyModuleCache_),
           jsCallInvoker_ = std::weak_ptr<CallInvoker>(jsCallInvoker_),
           nativeMethodCallInvoker_ =
@@ -322,7 +323,7 @@ void TurboModuleManager::installJSIBindings(
     TurboModuleBinding::install(
         runtime,
         createTurboModuleProvider(enableSyncVoidMethods),
-        createLegacyModuleProvider(enableSyncVoidMethods));
+        createLegacyModuleProvider());
   });
 }
 
diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
index fce31e012d8..d77f5dce80e 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
@@ -68,8 +68,7 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
 
   TurboModuleProviderFunctionType createTurboModuleProvider(
       bool enableSyncVoidMethods);
-  TurboModuleProviderFunctionType createLegacyModuleProvider(
-      bool enableSyncVoidMethods);
+  TurboModuleProviderFunctionType createLegacyModuleProvider();
 };
 
 } // namespace facebook::react