diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index 50aedd43421..ad5fb6985f9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -108,8 +108,7 @@ public class CatalystInstanceImpl implements CatalystInstance { // C++ parts private final HybridData mHybridData; - private static native HybridData initHybrid( - boolean enableRuntimeScheduler, boolean enableRuntimeSchedulerInTurboModule); + private static native HybridData initHybrid(); public native CallInvokerHolderImpl getJSCallInvokerHolder(); @@ -124,15 +123,7 @@ public class CatalystInstanceImpl implements CatalystInstance { FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge."); Systrace.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstanceImpl"); - if (ReactFeatureFlags.enableRuntimeSchedulerInTurboModule - && !ReactFeatureFlags.enableRuntimeScheduler) { - Assertions.assertUnreachable(); - } - - mHybridData = - initHybrid( - ReactFeatureFlags.enableRuntimeScheduler, - ReactFeatureFlags.enableRuntimeSchedulerInTurboModule); + mHybridData = initHybrid(); mReactQueueConfiguration = ReactQueueConfigurationImpl.create( 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 a8a5264042b..68728b18fed 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java +++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java @@ -70,10 +70,6 @@ public class ReactFeatureFlags { /** This feature flag enables logs for Fabric */ public static boolean enableFabricLogs = false; - public static boolean enableRuntimeScheduler = false; - - public static boolean enableRuntimeSchedulerInTurboModule = false; - /** Feature flag to configure eager attachment of the root view/initialisation of the JS code */ public static boolean enableEagerRootViewAttachment = false; diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp index 6a936c66f66..e44913e4fd0 100644 --- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp +++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp @@ -93,21 +93,12 @@ class JInstanceCallback : public InstanceCallback { } // namespace jni::local_ref -CatalystInstanceImpl::initHybrid( - jni::alias_ref, - bool enableRuntimeScheduler, - bool enableRuntimeSchedulerInTurboModule) { - return makeCxxInstance( - enableRuntimeScheduler, enableRuntimeSchedulerInTurboModule); +CatalystInstanceImpl::initHybrid(jni::alias_ref) { + return makeCxxInstance(); } -CatalystInstanceImpl::CatalystInstanceImpl( - bool enableRuntimeScheduler, - bool enableRuntimeSchedulerInTurboModule) - : instance_(std::make_unique()), - enableRuntimeScheduler_(enableRuntimeScheduler), - enableRuntimeSchedulerInTurboModule_( - enableRuntimeScheduler && enableRuntimeSchedulerInTurboModule) {} +CatalystInstanceImpl::CatalystInstanceImpl() + : instance_(std::make_unique()) {} void CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse() { CxxNativeModule::setShouldWarnOnUse(true); @@ -382,17 +373,12 @@ void CatalystInstanceImpl::handleMemoryPressure(int pressureLevel) { jni::alias_ref CatalystInstanceImpl::getJSCallInvokerHolder() { if (!jsCallInvokerHolder_) { - if (enableRuntimeSchedulerInTurboModule_) { - auto runtimeScheduler = getRuntimeScheduler(); - auto runtimeSchedulerCallInvoker = - std::make_shared( - runtimeScheduler->cthis()->get()); - jsCallInvokerHolder_ = jni::make_global( - CallInvokerHolder::newObjectCxxArgs(runtimeSchedulerCallInvoker)); - } else { - jsCallInvokerHolder_ = jni::make_global( - CallInvokerHolder::newObjectCxxArgs(instance_->getJSCallInvoker())); - } + auto runtimeScheduler = getRuntimeScheduler(); + auto runtimeSchedulerCallInvoker = + std::make_shared( + runtimeScheduler->cthis()->get()); + jsCallInvokerHolder_ = jni::make_global( + CallInvokerHolder::newObjectCxxArgs(runtimeSchedulerCallInvoker)); } return jsCallInvokerHolder_; } @@ -440,7 +426,7 @@ CatalystInstanceImpl::getRuntimeExecutor() { jni::alias_ref CatalystInstanceImpl::getRuntimeScheduler() { - if (enableRuntimeScheduler_ && !runtimeScheduler_) { + if (!runtimeScheduler_) { auto runtimeExecutor = instance_->getRuntimeExecutor(); auto runtimeScheduler = std::make_shared(runtimeExecutor); diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h index fe635bf4825..cd242903fab 100644 --- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h +++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h @@ -37,10 +37,7 @@ class CatalystInstanceImpl : public jni::HybridClass { static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/CatalystInstanceImpl;"; - static jni::local_ref initHybrid( - jni::alias_ref, - bool enableRuntimeScheduler, - bool enableRuntimeSchedulerInTurboModule); + static jni::local_ref initHybrid(jni::alias_ref); static void registerNatives(); @@ -51,9 +48,7 @@ class CatalystInstanceImpl : public jni::HybridClass { private: friend HybridBase; - CatalystInstanceImpl( - bool enableRuntimeScheduler, - bool enableRuntimeSchedulerInTurboModule); + CatalystInstanceImpl(); void initializeBridge( jni::alias_ref callback, @@ -120,9 +115,6 @@ class CatalystInstanceImpl : public jni::HybridClass { jni::global_ref nativeCallInvokerHolder_; jni::global_ref runtimeExecutor_; jni::global_ref runtimeScheduler_; - - bool const enableRuntimeScheduler_; - bool const enableRuntimeSchedulerInTurboModule_; }; } // namespace react