diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 17fb538b8..f3544cb81 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -19,7 +19,6 @@ import android.app.Application; import android.content.Intent; import com.facebook.infer.annotation.Assertions; -import com.facebook.react.bridge.NativeModuleCallExceptionHandler; import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContext; @@ -160,7 +159,6 @@ public abstract class ReactInstanceManager { protected boolean mUseDeveloperSupport; protected @Nullable LifecycleState mInitialLifecycleState; protected @Nullable UIImplementationProvider mUIImplementationProvider; - protected @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler; protected Builder() { } @@ -244,16 +242,6 @@ public abstract class ReactInstanceManager { return this; } - /** - * Set the exception handler for all native module calls. If not set, the default - * {@link DevSupportManager} will be used, which shows a redbox in dev mode and rethrows - * (crashes the app) in prod mode. - */ - public Builder setNativeModuleCallExceptionHandler(NativeModuleCallExceptionHandler handler) { - mNativeModuleCallExceptionHandler = handler; - return this; - } - /** * Instantiates a new {@link ReactInstanceManagerImpl}. * Before calling {@code build}, the following must be called: @@ -286,8 +274,7 @@ public abstract class ReactInstanceManager { mUseDeveloperSupport, mBridgeIdleDebugListener, Assertions.assertNotNull(mInitialLifecycleState, "Initial lifecycle state was not set"), - mUIImplementationProvider, - mNativeModuleCallExceptionHandler); + mUIImplementationProvider); } } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java index 7fd366809..6061074cd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java @@ -35,7 +35,6 @@ import com.facebook.react.bridge.JavaScriptExecutor; import com.facebook.react.bridge.JavaScriptModule; import com.facebook.react.bridge.JavaScriptModulesConfig; import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.NativeModuleCallExceptionHandler; import com.facebook.react.bridge.NativeModuleRegistry; import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener; import com.facebook.react.bridge.ProxyJavaScriptExecutor; @@ -101,7 +100,6 @@ import com.facebook.systrace.Systrace; private volatile boolean mHasStartedCreatingInitialContext = false; private final UIImplementationProvider mUIImplementationProvider; private final MemoryPressureRouter mMemoryPressureRouter; - private final @Nullable NativeModuleCallExceptionHandler mNativeModuleCallExceptionHandler; private final ReactInstanceDevCommandsHandler mDevInterface = new ReactInstanceDevCommandsHandler() { @@ -197,8 +195,7 @@ import com.facebook.systrace.Systrace; boolean useDeveloperSupport, @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener, LifecycleState initialLifecycleState, - UIImplementationProvider uiImplementationProvider, - NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) { + UIImplementationProvider uiImplementationProvider) { initializeSoLoaderIfNecessary(applicationContext); mApplicationContext = applicationContext; @@ -219,7 +216,6 @@ import com.facebook.systrace.Systrace; mLifecycleState = initialLifecycleState; mUIImplementationProvider = uiImplementationProvider; mMemoryPressureRouter = new MemoryPressureRouter(applicationContext); - mNativeModuleCallExceptionHandler = nativeModuleCallExceptionHandler; } @Override @@ -657,16 +653,13 @@ import com.facebook.systrace.Systrace; Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE); } - NativeModuleCallExceptionHandler exceptionHandler = mNativeModuleCallExceptionHandler != null - ? mNativeModuleCallExceptionHandler - : mDevSupportManager; CatalystInstanceImpl.Builder catalystInstanceBuilder = new CatalystInstanceImpl.Builder() .setCatalystQueueConfigurationSpec(CatalystQueueConfigurationSpec.createDefault()) .setJSExecutor(jsExecutor) .setRegistry(nativeModuleRegistry) .setJSModulesConfig(javaScriptModulesConfig) .setJSBundleLoader(jsBundleLoader) - .setNativeModuleCallExceptionHandler(exceptionHandler); + .setNativeModuleCallExceptionHandler(mDevSupportManager); Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "createCatalystInstance"); CatalystInstance catalystInstance;