diff --git a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java index 1be66e61b2f..5e4574f4481 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -25,13 +25,6 @@ public class ReactFeatureFlags { */ public static volatile boolean useTurboModules = false; - /** - * Should application use the new TM callback manager in Cxx? This is assumed to be a sane - * default, but it's new. We will delete once (1) we know it's safe to ship and (2) we have - * quantified impact. - */ - public static volatile boolean useTurboModulesRAIICallbackManager = false; - /** Should we dispatch TurboModule methods with promise returns to the NativeModules thread? */ public static volatile boolean enableTurboModulePromiseAsyncDispatch = false; diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java index f70251b70bf..fe0399529bd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/TurboModuleManager.java @@ -16,7 +16,6 @@ import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.CxxModuleWrapper; import com.facebook.react.bridge.JSIModule; import com.facebook.react.bridge.RuntimeExecutor; -import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder; import com.facebook.react.turbomodule.core.interfaces.TurboModule; import com.facebook.react.turbomodule.core.interfaces.TurboModuleRegistry; @@ -59,8 +58,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry { runtimeExecutor, (CallInvokerHolderImpl) jsCallInvokerHolder, (CallInvokerHolderImpl) nativeCallInvokerHolder, - delegate, - ReactFeatureFlags.useTurboModulesRAIICallbackManager); + delegate); installJSIBindings(); mEagerInitModuleNames = @@ -292,8 +290,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry { RuntimeExecutor runtimeExecutor, CallInvokerHolderImpl jsCallInvokerHolder, CallInvokerHolderImpl nativeCallInvokerHolder, - TurboModuleManagerDelegate tmmDelegate, - boolean useTurboModulesRAIICallbackManager); + TurboModuleManagerDelegate tmmDelegate); private native void installJSIBindings(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp index 2c567cf94d0..5878375bd36 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp @@ -39,15 +39,10 @@ jni::local_ref TurboModuleManager::initHybrid( jni::alias_ref runtimeExecutor, jni::alias_ref jsCallInvokerHolder, jni::alias_ref nativeCallInvokerHolder, - jni::alias_ref delegate, - bool useTurboModulesRAIICallbackManager) { + jni::alias_ref delegate) { auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker(); auto nativeCallInvoker = nativeCallInvokerHolder->cthis()->getCallInvoker(); - if (useTurboModulesRAIICallbackManager) { - JavaTurboModule::enableUseTurboModulesRAIICallbackManager(true); - } - return makeCxxInstance( jThis, runtimeExecutor->cthis()->get(), diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h index 15e0e7d094a..a8b05fda4d5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h @@ -32,8 +32,7 @@ class TurboModuleManager : public jni::HybridClass { jni::alias_ref runtimeExecutor, jni::alias_ref jsCallInvokerHolder, jni::alias_ref nativeCallInvokerHolder, - jni::alias_ref delegate, - bool useTurboModulesRAIICallbackManager); + jni::alias_ref delegate); static void registerNatives(); private: diff --git a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp index aa11f4579dc..1942bbfeac8 100644 --- a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp +++ b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp @@ -52,11 +52,6 @@ JavaTurboModule::~JavaTurboModule() { }); } -bool JavaTurboModule::useTurboModulesRAIICallbackManager_ = false; -void JavaTurboModule::enableUseTurboModulesRAIICallbackManager(bool enable) { - JavaTurboModule::useTurboModulesRAIICallbackManager_ = enable; -} - namespace { jni::local_ref createJavaCallbackFromJSIFunction( jsi::Function &&function, @@ -72,9 +67,7 @@ jni::local_ref createJavaCallbackFromJSIFunction( // 3. It cannot be a value, because that would be deleted as soon as this // function returns. auto callbackWrapperOwner = - (JavaTurboModule::useTurboModulesRAIICallbackManager_ - ? std::make_shared(weakWrapper) - : nullptr); + std::make_shared(weakWrapper); std::function fn = [weakWrapper, callbackWrapperOwner, wrapperWasCalled = false]( @@ -114,11 +107,7 @@ jni::local_ref createJavaCallbackFromJSIFunction( (const jsi::Value *)result.data(), result.size()); - if (JavaTurboModule::useTurboModulesRAIICallbackManager_) { - callbackWrapperOwner.reset(); - } else { - strongWrapper2->destroy(); - } + callbackWrapperOwner.reset(); }); wrapperWasCalled = true; diff --git a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h index 4cdde8cb357..77a067701fc 100644 --- a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h +++ b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h @@ -51,13 +51,6 @@ class JSI_EXPORT JavaTurboModule : public TurboModule { const jsi::Value *args, size_t argCount); - static void enableUseTurboModulesRAIICallbackManager(bool enable); - - /** - * Experiments - */ - static bool useTurboModulesRAIICallbackManager_; - private: jni::global_ref instance_; std::shared_ptr nativeInvoker_;