diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FabricUIManagerFactory.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FabricUIManagerFactory.java index e8fdd56f5b8..5d7e7b4fddc 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FabricUIManagerFactory.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/FabricUIManagerFactory.java @@ -7,7 +7,6 @@ package com.facebook.react.testing; -import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.UIManager; import com.facebook.react.uimanager.ViewManagerRegistry; @@ -16,7 +15,5 @@ import com.facebook.react.uimanager.ViewManagerRegistry; public interface FabricUIManagerFactory { UIManager getFabricUIManager( - ReactApplicationContext reactApplicationContext, - ViewManagerRegistry viewManagerRegistry, - JavaScriptContextHolder jsContext); + ReactApplicationContext reactApplicationContext, ViewManagerRegistry viewManagerRegistry); } diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java index 614b341b0ec..017094b8b61 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java @@ -266,7 +266,7 @@ public class ReactAppTestActivity extends FragmentActivity FabricUIManagerFactory factory = spec.getFabricUIManagerFactory(); return factory != null ? factory.getFabricUIManager( - reactApplicationContext, viewManagerRegistry, jsContext) + reactApplicationContext, viewManagerRegistry) : null; } }; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java index c88b867df23..827c59d2438 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java @@ -11,7 +11,6 @@ import android.annotation.SuppressLint; import androidx.annotation.NonNull; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; -import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.NativeMap; import com.facebook.react.bridge.RuntimeExecutor; import com.facebook.react.bridge.queue.MessageQueueThread; @@ -35,7 +34,6 @@ public class Binding { } private native void installFabricUIManager( - long jsContextNativePointer, RuntimeExecutor runtimeExecutor, Object uiManager, EventBeatManager eventBeatManager, @@ -76,7 +74,6 @@ public class Binding { // TODO (T67721598) Remove the jsContext param once we've migrated to using RuntimeExecutor public void register( - @NonNull JavaScriptContextHolder jsContext, @NonNull RuntimeExecutor runtimeExecutor, @NonNull FabricUIManager fabricUIManager, @NonNull EventBeatManager eventBeatManager, @@ -85,7 +82,6 @@ public class Binding { @NonNull ReactNativeConfig reactNativeConfig) { fabricUIManager.setBinding(this); installFabricUIManager( - jsContext.get(), runtimeExecutor, fabricUIManager, eventBeatManager, diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java index 136da3a752a..8f3516f262b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricJSIModuleProvider.java @@ -10,7 +10,6 @@ package com.facebook.react.fabric; import androidx.annotation.NonNull; import com.facebook.infer.annotation.Assertions; import com.facebook.react.bridge.JSIModuleProvider; -import com.facebook.react.bridge.JavaScriptContextHolder; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.UIManager; import com.facebook.react.bridge.queue.MessageQueueThread; @@ -42,18 +41,15 @@ import com.facebook.systrace.Systrace; public class FabricJSIModuleProvider implements JSIModuleProvider { - @NonNull private final JavaScriptContextHolder mJSContext; @NonNull private final ReactApplicationContext mReactApplicationContext; @NonNull private final ComponentFactoryDelegate mComponentFactoryDelegate; @NonNull private final ReactNativeConfig mConfig; public FabricJSIModuleProvider( @NonNull ReactApplicationContext reactApplicationContext, - @NonNull JavaScriptContextHolder jsContext, @NonNull ComponentFactoryDelegate componentFactoryDelegate, @NonNull ReactNativeConfig config) { mReactApplicationContext = reactApplicationContext; - mJSContext = jsContext; mComponentFactoryDelegate = componentFactoryDelegate; mConfig = config; } @@ -74,7 +70,6 @@ public class FabricJSIModuleProvider implements JSIModuleProvider { .getJSQueueThread(); binding.register( - mJSContext, mReactApplicationContext.getCatalystInstance().getRuntimeExecutor(), uiManager, eventBeatManager, diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp index 715cf1bea97..e44f1c232cb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp @@ -206,7 +206,6 @@ void Binding::setConstraints( } void Binding::installFabricUIManager( - jlong jsContextNativePointer, jni::alias_ref runtimeExecutorHolder, jni::alias_ref javaUIManager, EventBeatManager *eventBeatManager, @@ -240,24 +239,7 @@ void Binding::installFabricUIManager( auto sharedJSMessageQueueThread = std::make_shared(jsMessageQueueThread); - - bool useRuntimeExecutor = - config->getBool("react_fabric:use_shared_runtime_executor_android"); - - RuntimeExecutor runtimeExecutor; - if (useRuntimeExecutor) { - runtimeExecutor = runtimeExecutorHolder->cthis()->get(); - } else { - Runtime *runtime = (Runtime *)jsContextNativePointer; - runtimeExecutor = - [runtime, sharedJSMessageQueueThread]( - std::function &&callback) { - sharedJSMessageQueueThread->runOnQueue( - [runtime, callback = std::move(callback)]() { - callback(*runtime); - }); - }; - } + auto runtimeExecutor = runtimeExecutorHolder->cthis()->get(); // TODO: T31905686 Create synchronous Event Beat jni::global_ref localJavaUIManager = javaUIManager_; diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h index 3d1d439f5e5..b43f2b0532b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h @@ -53,7 +53,6 @@ class Binding : public jni::HybridClass, static jni::local_ref initHybrid(jni::alias_ref); void installFabricUIManager( - jlong jsContextNativePointer, jni::alias_ref runtimeExecutorHolder, jni::alias_ref javaUIManager, EventBeatManager *eventBeatManager,