From 4899f8c5e6823f32ccc37cfa6dbdb60083162c51 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Fri, 5 Aug 2022 08:57:42 -0700
Subject: [PATCH] Remove
 react_native_new_architecture.enable_runtimescheduler_in_turbomodule_android
 flag

Summary:
changelog: [internal]

Turbomodules with RuntimeScheduler on Android are shipped. Let's remove the flag.

jest_e2e[run_all_tests]

Reviewed By: RSNara

Differential Revision: D38456492

fbshipit-source-id: 3dd77c4dc644f1f84b5b74f346fefd701d4cb515
---
 .../react/bridge/CatalystInstanceImpl.java       | 13 ++-----------
 .../facebook/react/config/ReactFeatureFlags.java |  2 --
 .../main/jni/react/jni/CatalystInstanceImpl.cpp  | 16 +++++-----------
 .../main/jni/react/jni/CatalystInstanceImpl.h    |  8 ++------
 4 files changed, 9 insertions(+), 30 deletions(-)

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..aa1ca2b797b 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(boolean enableRuntimeScheduler);
 
   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(ReactFeatureFlags.enableRuntimeScheduler);
 
     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 4be9e5bc100..a9961cb2f4d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java
@@ -72,8 +72,6 @@ public class ReactFeatureFlags {
 
   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..a48d641a8f3 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -95,19 +95,13 @@ class JInstanceCallback : public InstanceCallback {
 jni::local_ref<CatalystInstanceImpl::jhybriddata>
 CatalystInstanceImpl::initHybrid(
     jni::alias_ref<jclass>,
-    bool enableRuntimeScheduler,
-    bool enableRuntimeSchedulerInTurboModule) {
-  return makeCxxInstance(
-      enableRuntimeScheduler, enableRuntimeSchedulerInTurboModule);
+    bool enableRuntimeScheduler) {
+  return makeCxxInstance(enableRuntimeScheduler);
 }
 
-CatalystInstanceImpl::CatalystInstanceImpl(
-    bool enableRuntimeScheduler,
-    bool enableRuntimeSchedulerInTurboModule)
+CatalystInstanceImpl::CatalystInstanceImpl(bool enableRuntimeScheduler)
     : instance_(std::make_unique<Instance>()),
-      enableRuntimeScheduler_(enableRuntimeScheduler),
-      enableRuntimeSchedulerInTurboModule_(
-          enableRuntimeScheduler && enableRuntimeSchedulerInTurboModule) {}
+      enableRuntimeScheduler_(enableRuntimeScheduler) {}
 
 void CatalystInstanceImpl::warnOnLegacyNativeModuleSystemUse() {
   CxxNativeModule::setShouldWarnOnUse(true);
@@ -382,7 +376,7 @@ void CatalystInstanceImpl::handleMemoryPressure(int pressureLevel) {
 jni::alias_ref<CallInvokerHolder::javaobject>
 CatalystInstanceImpl::getJSCallInvokerHolder() {
   if (!jsCallInvokerHolder_) {
-    if (enableRuntimeSchedulerInTurboModule_) {
+    if (enableRuntimeScheduler_) {
       auto runtimeScheduler = getRuntimeScheduler();
       auto runtimeSchedulerCallInvoker =
           std::make_shared<RuntimeSchedulerCallInvoker>(
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
index fe635bf4825..cd743906a4b 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
@@ -39,8 +39,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
 
   static jni::local_ref<jhybriddata> initHybrid(
       jni::alias_ref<jclass>,
-      bool enableRuntimeScheduler,
-      bool enableRuntimeSchedulerInTurboModule);
+      bool enableRuntimeScheduler);
 
   static void registerNatives();
 
@@ -51,9 +50,7 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
  private:
   friend HybridBase;
 
-  CatalystInstanceImpl(
-      bool enableRuntimeScheduler,
-      bool enableRuntimeSchedulerInTurboModule);
+  CatalystInstanceImpl(bool enableRuntimeScheduler);
 
   void initializeBridge(
       jni::alias_ref<ReactCallback::javaobject> callback,
@@ -122,7 +119,6 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
   jni::global_ref<JRuntimeScheduler::javaobject> runtimeScheduler_;
 
   bool const enableRuntimeScheduler_;
-  bool const enableRuntimeSchedulerInTurboModule_;
 };
 
 } // namespace react