Expose JSExceptionHandler to ReactNativeHost (facebook#44172)

Summary: Pull Request resolved: facebook#44172 Changelog: [Android][Added] Option to set a custom JSExceptionHandler instance Reviewed By: javache Differential Revision: D56382090 fbshipit-source-id: 69ad72ee34f1c9f636d95035d0463c5344cb4a37
kosmydel · May 6, 2024 · 13d74c8 · 13d74c8
1 parent 41108a4
commit 13d74c8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api
@@ -318,6 +318,7 @@ public abstract class com/facebook/react/ReactNativeHost {
 	protected fun getDevSupportManagerFactory ()Lcom/facebook/react/devsupport/DevSupportManagerFactory;
 	protected fun getJSBundleFile ()Ljava/lang/String;
 	protected fun getJSEngineResolutionAlgorithm ()Lcom/facebook/react/JSEngineResolutionAlgorithm;
+	protected fun getJSExceptionHandler ()Lcom/facebook/react/bridge/JSExceptionHandler;
 	protected fun getJSMainModuleName ()Ljava/lang/String;
 	protected fun getJavaScriptExecutorFactory ()Lcom/facebook/react/bridge/JavaScriptExecutorFactory;
 	public fun getLazyViewManagersEnabled ()Z

diff --git a/...act-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/...act-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
@@ -258,7 +258,7 @@ public ReactInstanceManagerBuilder setInitialLifecycleState(
    * DevSupportManager} will be used, which shows a redbox in dev mode and rethrows (crashes the
    * app) in prod mode.
    */
-  public ReactInstanceManagerBuilder setJSExceptionHandler(JSExceptionHandler handler) {
+  public ReactInstanceManagerBuilder setJSExceptionHandler(@Nullable JSExceptionHandler handler) {
     mJSExceptionHandler = handler;
     return this;
   }

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactNativeHost.java
@@ -10,6 +10,7 @@
 import android.app.Application;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
@@ -89,6 +90,7 @@ protected ReactInstanceManagerBuilder getBaseReactInstanceManagerBuilder() {
             .setDevLoadingViewManager(getDevLoadingViewManager())
             .setRequireActivity(getShouldRequireActivity())
             .setSurfaceDelegateFactory(getSurfaceDelegateFactory())
+            .setJSExceptionHandler(getJSExceptionHandler())
             .setLazyViewManagersEnabled(getLazyViewManagersEnabled())
             .setRedBoxHandler(getRedBoxHandler())
             .setJavaScriptExecutorFactory(getJavaScriptExecutorFactory())
@@ -118,6 +120,10 @@ protected ReactInstanceManagerBuilder getBaseReactInstanceManagerBuilder() {
     return null;
   }
 
+  protected @Nullable JSExceptionHandler getJSExceptionHandler() {
+    return null;
+  }
+
   /** Get the {@link JavaScriptExecutorFactory}. Override this to use a custom Executor. */
   protected @Nullable JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
     return null;