From f47635374dcf15ef73253394264f3f812c14becc Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Wed, 18 Oct 2023 14:16:06 +0100
Subject: [PATCH] Revert "Add ExceptionsManagerModule for RNTester (#40767)"

This reverts commit 034d815cfdf202a969f4d6a5662bcdcaacba587c.
---
 .../java/com/facebook/react/runtime/CoreReactPackage.java    | 5 -----
 .../java/com/facebook/react/uiapp/RNTesterApplication.java   | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java
index 7ba138cd6b9..5ed3e4aa8d1 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.java
@@ -19,7 +19,6 @@ import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.facebook.react.modules.core.ExceptionsManagerModule;
 import com.facebook.react.modules.debug.DevSettingsModule;
 import com.facebook.react.modules.debug.SourceCodeModule;
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
@@ -37,7 +36,6 @@ import java.util.Map;
       SourceCodeModule.class,
       LogBoxModule.class,
       DeviceEventManagerModule.class,
-      ExceptionsManagerModule.class,
     })
 class CoreReactPackage extends TurboReactPackage {
 
@@ -65,8 +63,6 @@ class CoreReactPackage extends TurboReactPackage {
         return new DeviceEventManagerModule(reactContext, mHardwareBackBtnHandler);
       case LogBoxModule.NAME:
         return new LogBoxModule(reactContext, mDevSupportManager);
-      case ExceptionsManagerModule.NAME:
-        return new ExceptionsManagerModule(mDevSupportManager);
       default:
         throw new IllegalArgumentException(
             "In BridgelessReactPackage, could not find Native module for " + name);
@@ -89,7 +85,6 @@ class CoreReactPackage extends TurboReactPackage {
             DevSettingsModule.class,
             DeviceEventManagerModule.class,
             LogBoxModule.class,
-            ExceptionsManagerModule.class,
           };
       final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
       for (Class<? extends NativeModule> moduleClass : moduleList) {
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index a1c02a8f005..8bf2493c5a8 100644
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -170,6 +170,9 @@ public class RNTesterApplication extends Application implements ReactApplication
 
   @Override
   public ReactNativeHost getReactNativeHost() {
+    if (ReactFeatureFlags.enableBridgelessArchitecture) {
+      throw new RuntimeException("Should not use ReactNativeHost when Bridgeless enabled");
+    }
     return mReactNativeHost;
   }