react-native-tvos 0.83.2-0 → 0.84.0-0

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -57,6 +57,7 @@ import com.facebook.react.modules.appregistry.AppRegistry;
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.IllegalViewOperationException;
+import com.facebook.react.uimanager.JSKeyDispatcher;
 import com.facebook.react.uimanager.JSPointerDispatcher;
 import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.PixelUtil;
@@ -106,6 +107,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
   private boolean mShouldLogContentAppeared;
   private @Nullable JSTouchDispatcher mJSTouchDispatcher;
   private @Nullable JSPointerDispatcher mJSPointerDispatcher;
+  private @Nullable JSKeyDispatcher mJSKeyDispatcher;
   private final ReactAndroidHWInputDeviceHelper mAndroidHWInputDeviceHelper =
       new ReactAndroidHWInputDeviceHelper();
   private boolean mWasMeasured = false;
@@ -334,10 +336,17 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       FLog.w(TAG, "Unable to handle key event as the catalyst instance has not been attached");
       return super.dispatchKeyEvent(ev);
     }
+
     ReactContext context = getCurrentReactContext();
-    if (context != null) {
-      mAndroidHWInputDeviceHelper.handleKeyEvent(ev, context);
+    if (context == null) {
+      return super.dispatchKeyEvent(ev);
     }
+
+    mAndroidHWInputDeviceHelper.handleKeyEvent(ev, context);
+
+    // Dispatch during the capture phase before children handle the event as the focus could shift
+    dispatchJSKeyEvent(ev);
+
     return super.dispatchKeyEvent(ev);
   }
 
@@ -378,6 +387,31 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     }
   }
 
+  protected void dispatchJSKeyEvent(KeyEvent ev) {
+    if (!ReactNativeFeatureFlags.enableKeyEvents()) {
+      // Silently return early if key events are disabled
+      return;
+    }
+    if (!hasActiveReactContext() || !isViewAttachedToReactInstance()) {
+      FLog.w(
+          TAG, "Unable to dispatch key event to JS as the catalyst instance has not been attached");
+      return;
+    }
+    if (mJSKeyDispatcher == null) {
+      FLog.w(TAG, "Unable to dispatch key event to JS before the dispatcher is available");
+      return;
+    }
+    ReactContext context = getCurrentReactContext();
+    if (context != null) {
+      EventDispatcher eventDispatcher =
+          UIManagerHelper.getEventDispatcher(context, getUIManagerType());
+      int surfaceId = UIManagerHelper.getSurfaceId(context);
+      if (eventDispatcher != null) {
+        mJSKeyDispatcher.handleKeyEvent(ev, eventDispatcher, surfaceId);
+      }
+    }
+  }
+
   @Override
   public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
     // Override in order to still receive events to onInterceptTouchEvent even when some other
@@ -634,6 +668,10 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       mJSPointerDispatcher = new JSPointerDispatcher(this);
     }
 
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      mJSKeyDispatcher = new JSKeyDispatcher();
+    }
+
     if (mRootViewEventListener != null) {
       mRootViewEventListener.onAttachedToReactInstance(this);
     }
@@ -712,6 +750,9 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
     if (ReactFeatureFlags.dispatchPointerEvents) {
       mJSPointerDispatcher = new JSPointerDispatcher(this);
     }
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      mJSKeyDispatcher = new JSKeyDispatcher();
+    }
   }
 
   @VisibleForTesting

package/ReactAndroid/src/main/java/com/facebook/react/ViewManagerOnDemandReactPackage.kt

@@ -10,16 +10,65 @@ package com.facebook.react
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 
+/**
+ * Interface for React Native packages that provide ViewManagers on-demand rather than eagerly.
+ *
+ * This interface enables lazy initialization of ViewManagers, improving startup performance by
+ * deferring the creation of ViewManager instances until they are actually needed by the JavaScript
+ * code. Instead of instantiating all ViewManagers during package initialization, implementing
+ * classes can defer creation until a specific ViewManager is requested by name.
+ *
+ * This pattern is particularly beneficial for applications with many ViewManagers, as it reduces
+ * memory footprint and initialization time by only creating the ViewManagers that are actively
+ * used.
+ *
+ * Implementing classes should maintain a registry or factory mechanism to create ViewManagers based
+ * on their names when requested.
+ *
+ * @see com.facebook.react.uimanager.ViewManager
+ * @see com.facebook.react.ReactPackage
+ */
 public interface ViewManagerOnDemandReactPackage {
   /**
-   * Provides a list of names of ViewManagers with which these modules can be accessed from JS.
-   * Typically, this is ViewManager.getName().
+   * Provides the names of all ViewManagers available in this package.
+   *
+   * This method returns a collection of ViewManager names that can be accessed from JavaScript. The
+   * names returned should match the values returned by [ViewManager.getName] for each ViewManager
+   * that this package can create. The React Native framework uses these names to determine which
+   * ViewManagers are available and to request their creation on-demand.
+   *
+   * This method is called during the initialization phase to register available ViewManagers
+   * without actually instantiating them, enabling lazy loading.
+   *
+   * @param reactContext The React application context, which provides access to the Android
+   *   application context and React Native lifecycle information
+   * @return A collection of ViewManager names. Returns an empty collection if no ViewManagers are
+   *   available. The returned names should be unique within this package
    */
   public fun getViewManagerNames(reactContext: ReactApplicationContext): Collection<String>
 
   /**
-   * Creates and returns a ViewManager with a specific name {@param viewManagerName}. It's up to an
-   * implementing package how to interpret the name.
+   * Creates and returns a ViewManager instance for the specified name.
+   *
+   * This method is called lazily when a ViewManager is actually needed by the JavaScript code,
+   * rather than during package initialization. The implementation should create and configure the
+   * appropriate ViewManager based on the provided name. The name parameter corresponds to one of
+   * the names returned by [getViewManagerNames].
+   *
+   * Implementations have flexibility in how they interpret the name and create ViewManagers. For
+   * example, they might use a factory pattern, reflection, or a simple name-to-class mapping.
+   *
+   * This method may be called on any thread, so implementations should ensure thread safety if
+   * necessary.
+   *
+   * @param reactContext The React application context, which provides access to the Android
+   *   application context and React Native lifecycle information needed to initialize the
+   *   ViewManager
+   * @param viewManagerName The name of the ViewManager to create, matching one of the names
+   *   returned by [getViewManagerNames]
+   * @return A ViewManager instance for the specified name, or null if the name is not recognized or
+   *   the ViewManager cannot be created. Returning null will result in a JavaScript error when the
+   *   native component is used
    */
   public fun createViewManager(
       reactContext: ReactApplicationContext,

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.kt

@@ -75,24 +75,6 @@ public interface CatalystInstance : MemoryPressureListener, JSInstance, JSBundle
    */
   public fun extendNativeModules(modules: NativeModuleRegistry)
 
-  /**
-   * Adds a idle listener for this Catalyst instance. The listener will receive notifications
-   * whenever the bridge transitions from idle to busy and vice-versa, where the busy state is
-   * defined as there being some non-zero number of calls to JS that haven't resolved via a
-   * onBatchCompleted call. The listener should be purely passive and not affect application logic.
-   */
-  public fun addBridgeIdleDebugListener(
-      @Suppress("DEPRECATION") listener: NotThreadSafeBridgeIdleDebugListener
-  )
-
-  /**
-   * Removes a NotThreadSafeBridgeIdleDebugListener previously added with
-   * [addBridgeIdleDebugListener]
-   */
-  public fun removeBridgeIdleDebugListener(
-      @Suppress("DEPRECATION") listener: NotThreadSafeBridgeIdleDebugListener
-  )
-
   /** This method registers the file path of an additional JS segment by its ID. */
   public fun registerSegment(segmentId: Int, path: String)
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java

@@ -7,7 +7,6 @@
 
 package com.facebook.react.bridge;
 
-import static com.facebook.infer.annotation.Assertions.assertCondition;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT;
 
@@ -39,7 +38,6 @@ import com.facebook.systrace.TraceListener;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -88,7 +86,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
 
   // Access from any thread
   private final ReactQueueConfigurationImpl mReactQueueConfiguration;
-  private final CopyOnWriteArrayList<NotThreadSafeBridgeIdleDebugListener> mBridgeIdleListeners;
   private final AtomicInteger mPendingJSCalls = new AtomicInteger(0);
   private final String mJsPendingCallsTitleForTrace =
       "pending_js_calls_instance" + sNextInstanceIdForTrace.getAndIncrement();
@@ -121,15 +118,12 @@ public class CatalystInstanceImpl implements CatalystInstance {
 
   public native NativeMethodCallInvokerHolderImpl getNativeMethodCallInvokerHolder();
 
-  private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
-
   private CatalystInstanceImpl(
       final ReactQueueConfigurationSpec reactQueueConfigurationSpec,
       final JavaScriptExecutor jsExecutor,
       final NativeModuleRegistry nativeModuleRegistry,
       final JSBundleLoader jsBundleLoader,
-      JSExceptionHandler jSExceptionHandler,
-      @Nullable ReactInstanceManagerInspectorTarget inspectorTarget) {
+      JSExceptionHandler jSExceptionHandler) {
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge.");
     Systrace.beginSection(TRACE_TAG_REACT, "createCatalystInstanceImpl");
 
@@ -138,14 +132,12 @@ public class CatalystInstanceImpl implements CatalystInstance {
     mReactQueueConfiguration =
         ReactQueueConfigurationImpl.create(
             reactQueueConfigurationSpec, new NativeExceptionHandler());
-    mBridgeIdleListeners = new CopyOnWriteArrayList<>();
     mNativeModuleRegistry = nativeModuleRegistry;
     mJSModuleRegistry = new JavaScriptModuleRegistry();
     mJSBundleLoader = jsBundleLoader;
     mJSExceptionHandler = jSExceptionHandler;
     mNativeModulesQueueThread = mReactQueueConfiguration.getNativeModulesQueueThread();
     mTraceListener = new JSProfilerTraceListener(this);
-    mInspectorTarget = inspectorTarget;
     Systrace.endSection(TRACE_TAG_REACT);
 
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge before initializeBridge");
@@ -156,9 +148,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
         jsExecutor,
         mReactQueueConfiguration.getJSQueueThread(),
         mNativeModulesQueueThread,
-        mNativeModuleRegistry.getJavaModules(this),
-        mNativeModuleRegistry.getCxxModules(),
-        mInspectorTarget);
+        mNativeModuleRegistry.getJavaModules(this));
     FLog.d(ReactConstants.TAG, "Initializing React Xplat Bridge after initializeBridge");
     Systrace.endSection(TRACE_TAG_REACT);
 
@@ -176,16 +166,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
       mOuter = new WeakReference<>(outer);
     }
 
-    public void onBatchComplete() {
-      CatalystInstanceImpl impl = mOuter.get();
-      if (impl != null) {
-        impl.mNativeModulesQueueThread.runOnQueue(
-            () -> {
-              impl.mNativeModuleRegistry.onBatchComplete();
-            });
-      }
-    }
-
     public void incrementPendingJSCalls() {
       CatalystInstanceImpl impl = mOuter.get();
       if (impl != null) {
@@ -212,22 +192,18 @@ public class CatalystInstanceImpl implements CatalystInstance {
     // Extend the Java-visible registry of modules
     mNativeModuleRegistry.registerModules(modules);
     Collection<JavaModuleWrapper> javaModules = modules.getJavaModules(this);
-    Collection<ModuleHolder> cxxModules = modules.getCxxModules();
     // Extend the Cxx-visible registry of modules wrapped in appropriate interfaces
-    jniExtendNativeModules(javaModules, cxxModules);
+    jniExtendNativeModules(javaModules);
   }
 
-  private native void jniExtendNativeModules(
-      Collection<JavaModuleWrapper> javaModules, Collection<ModuleHolder> cxxModules);
+  private native void jniExtendNativeModules(Collection<JavaModuleWrapper> javaModules);
 
   private native void initializeBridge(
       InstanceCallback callback,
       JavaScriptExecutor jsExecutor,
       MessageQueueThread jsQueue,
       MessageQueueThread moduleQueue,
-      Collection<JavaModuleWrapper> javaModules,
-      Collection<ModuleHolder> cxxModules,
-      @Nullable ReactInstanceManagerInspectorTarget inspectorTarget);
+      Collection<JavaModuleWrapper> javaModules);
 
   @Override
   public void setSourceURLs(String deviceURL, String remoteURL) {
@@ -358,13 +334,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
       return;
     }
 
-    if (mInspectorTarget != null) {
-      assertCondition(
-          mInspectorTarget.isValid(),
-          "ReactInstanceManager inspector target destroyed before instance was unregistered");
-    }
-    unregisterFromInspector();
-
     // TODO: tell all APIs to shut down
     ReactMarker.logMarker(ReactMarkerConstants.DESTROY_CATALYST_INSTANCE_START);
     mDestroyed = true;
@@ -376,14 +345,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
             mFabricUIManager.invalidate();
           }
           boolean wasIdle = (mPendingJSCalls.getAndSet(0) == 0);
-          if (!mBridgeIdleListeners.isEmpty()) {
-            for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-              if (!wasIdle) {
-                listener.onTransitionToBridgeIdle();
-              }
-              listener.onBridgeDestroyed();
-            }
-          }
 
           getReactQueueConfiguration()
               .getJSQueueThread()
@@ -525,30 +486,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
     jniHandleMemoryPressure(level);
   }
 
-  /**
-   * Adds a idle listener for this Catalyst instance. The listener will receive notifications
-   * whenever the bridge transitions from idle to busy and vice-versa, where the busy state is
-   * defined as there being some non-zero number of calls to JS that haven't resolved via a
-   * onBatchComplete call. The listener should be purely passive and not affect application logic.
-   *
-   * @noinspection deprecation
-   */
-  @Override
-  public void addBridgeIdleDebugListener(NotThreadSafeBridgeIdleDebugListener listener) {
-    mBridgeIdleListeners.add(listener);
-  }
-
-  /**
-   * Removes a NotThreadSafeBridgeIdleDebugListener previously added with {@link
-   * #addBridgeIdleDebugListener}
-   *
-   * @noinspection deprecation
-   */
-  @Override
-  public void removeBridgeIdleDebugListener(NotThreadSafeBridgeIdleDebugListener listener) {
-    mBridgeIdleListeners.remove(listener);
-  }
-
   @Override
   public native void setGlobalVariable(String propName, String jsonValue);
 
@@ -565,16 +502,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
 
   private void incrementPendingJSCalls() {
     int oldPendingCalls = mPendingJSCalls.getAndIncrement();
-    boolean wasIdle = oldPendingCalls == 0;
     Systrace.traceCounter(TRACE_TAG_REACT, mJsPendingCallsTitleForTrace, oldPendingCalls + 1);
-    if (wasIdle && !mBridgeIdleListeners.isEmpty()) {
-      mNativeModulesQueueThread.runOnQueue(
-          () -> {
-            for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-              listener.onTransitionToBridgeBusy();
-            }
-          });
-    }
   }
 
   @Override
@@ -596,17 +524,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
     int newPendingCalls = mPendingJSCalls.decrementAndGet();
     // TODO(9604406): handle case of web workers injecting messages to main thread
     // Assertions.assertCondition(newPendingCalls >= 0);
-    boolean isNowIdle = newPendingCalls == 0;
     Systrace.traceCounter(TRACE_TAG_REACT, mJsPendingCallsTitleForTrace, newPendingCalls);
-
-    if (isNowIdle && !mBridgeIdleListeners.isEmpty()) {
-      mNativeModulesQueueThread.runOnQueue(
-          () -> {
-            for (NotThreadSafeBridgeIdleDebugListener listener : mBridgeIdleListeners) {
-              listener.onTransitionToBridgeIdle();
-            }
-          });
-    }
   }
 
   private void onNativeException(Exception e) {
@@ -663,7 +581,6 @@ public class CatalystInstanceImpl implements CatalystInstance {
     private @Nullable NativeModuleRegistry mRegistry;
     private @Nullable JavaScriptExecutor mJSExecutor;
     private @Nullable JSExceptionHandler mJSExceptionHandler;
-    private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
 
     public Builder setReactQueueConfigurationSpec(
         ReactQueueConfigurationSpec ReactQueueConfigurationSpec) {
@@ -691,20 +608,13 @@ public class CatalystInstanceImpl implements CatalystInstance {
       return this;
     }
 
-    public Builder setInspectorTarget(
-        @Nullable ReactInstanceManagerInspectorTarget inspectorTarget) {
-      mInspectorTarget = inspectorTarget;
-      return this;
-    }
-
     public CatalystInstanceImpl build() {
       return new CatalystInstanceImpl(
           Assertions.assertNotNull(mReactQueueConfigurationSpec),
           Assertions.assertNotNull(mJSExecutor),
           Assertions.assertNotNull(mRegistry),
           Assertions.assertNotNull(mJSBundleLoader),
-          Assertions.assertNotNull(mJSExceptionHandler),
-          mInspectorTarget);
+          Assertions.assertNotNull(mJSExceptionHandler));
     }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaMethodWrapper.kt

@@ -347,8 +347,23 @@ internal class JavaMethodWrapper(
               if (jsArguments.isNull(atIndex)) {
                 null
               } else {
-                val id = jsArguments.getDouble(atIndex).toInt()
-                @Suppress("DEPRECATION") CallbackImpl(jsInstance, id)
+                object : Callback {
+                  private var invoked = false
+
+                  override fun invoke(vararg args: Any?) {
+                    if (invoked) {
+                      error(
+                          "Illegal callback invocation from native module. This callback type only permits a single invocation from native code."
+                      )
+                    }
+                    @Suppress("UNCHECKED_CAST")
+                    jsInstance.invokeCallback(
+                        callbackID = jsArguments.getDouble(atIndex).toInt(),
+                        arguments = Arguments.fromJavaArgs(args as Array<Any?>),
+                    )
+                    invoked = true
+                  }
+                }
               }
         }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ModuleHolder.kt

@@ -60,7 +60,7 @@ public class ModuleHolder {
             nativeModule.javaClass.simpleName,
             nativeModule.canOverrideExistingModule(),
             true,
-            CxxModuleWrapper::class.java.isAssignableFrom(nativeModule.javaClass),
+            false,
             ReactModuleInfo.classIsTurboModule(nativeModule.javaClass),
         )
 
@@ -108,7 +108,7 @@ public class ModuleHolder {
     get() = reactModuleInfo.isTurboModule
 
   public val isCxxModule: Boolean
-    get() = reactModuleInfo.isCxxModule
+    get() = false
 
   public val className: String
     get() = reactModuleInfo.className

package/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.kt

@@ -36,25 +36,10 @@ public class NativeModuleRegistry(
   @JvmName("getJavaModules") // This is needed because this method is accessed by JNI
   internal fun getJavaModules(jsInstance: JSInstance): List<JavaModuleWrapper> = buildList {
     for ((_, value) in modules) {
-      if (!value.isCxxModule) {
-        add(JavaModuleWrapper(jsInstance, value))
-      }
+      add(JavaModuleWrapper(jsInstance, value))
     }
   }
 
-  @get:JvmName(
-      "getCxxModules"
-  ) // This is needed till there are Java Consumer of this API inside React
-  // Native
-  internal val cxxModules: List<ModuleHolder>
-    get() = buildList {
-      for ((_, value) in modules) {
-        if (value.isCxxModule) {
-          add(value)
-        }
-      }
-    }
-
   /** Adds any new modules to the current module registry */
   @JvmName(
       "registerModules"
@@ -109,23 +94,6 @@ public class NativeModuleRegistry(
     }
   }
 
-  public fun onBatchComplete() {
-    // The only native module that uses the onBatchComplete is the UI Manager. Hence, instead of
-    // iterating over all the modules for find this one instance, and then calling it, we
-    // short-circuit
-    // the search, and simply call OnBatchComplete on the UI Manager.
-    // With Fabric, UIManager would no longer be a NativeModule, so this call would simply go away
-    assertLegacyArchitecture(
-        "NativeModuleRegistry.onBatchComplete()",
-        LegacyArchitectureLogLevel.WARNING,
-    )
-    modules["UIManager"]?.let {
-      if (it.hasInstance()) {
-        (it.module as OnBatchCompleteListener).onBatchComplete()
-      }
-    }
-  }
-
   public fun <T : NativeModule> hasModule(moduleInterface: Class<T>): Boolean {
     val annotation = moduleInterface.getAnnotation(ReactModule::class.java)
     requireNotNull(annotation) {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/Promise.kt

@@ -28,7 +28,7 @@ public interface Promise {
    * @param code String
    * @param message String
    */
-  public fun reject(code: String, message: String?)
+  public fun reject(code: String?, message: String?)
 
   /**
    * Report an exception with a custom code.
@@ -36,7 +36,7 @@ public interface Promise {
    * @param code String
    * @param throwable Throwable
    */
-  public fun reject(code: String, throwable: Throwable?)
+  public fun reject(code: String?, throwable: Throwable?)
 
   /**
    * Report an exception with a custom code and error message.
@@ -45,7 +45,7 @@ public interface Promise {
    * @param message String
    * @param throwable Throwable
    */
-  public fun reject(code: String, message: String?, throwable: Throwable?)
+  public fun reject(code: String?, message: String?, throwable: Throwable?)
 
   /**
    * Report an exception, with default error code. Useful in catch-all scenarios where it's unclear
@@ -73,7 +73,7 @@ public interface Promise {
    * @param code String
    * @param userInfo WritableMap
    */
-  public fun reject(code: String, userInfo: WritableMap)
+  public fun reject(code: String?, userInfo: WritableMap)
 
   /**
    * Report an exception with a custom code and userInfo.
@@ -82,7 +82,7 @@ public interface Promise {
    * @param throwable Throwable
    * @param userInfo WritableMap
    */
-  public fun reject(code: String, throwable: Throwable?, userInfo: WritableMap)
+  public fun reject(code: String?, throwable: Throwable?, userInfo: WritableMap)
 
   /**
    * Report an error with a custom code, error message and userInfo, an error not caused by an
@@ -92,7 +92,7 @@ public interface Promise {
    * @param message String
    * @param userInfo WritableMap
    */
-  public fun reject(code: String, message: String?, userInfo: WritableMap)
+  public fun reject(code: String?, message: String?, userInfo: WritableMap)
 
   /**
    * Report an exception with a custom code, error message and userInfo.

package/ReactAndroid/src/main/java/com/facebook/react/bridge/PromiseImpl.kt

@@ -38,7 +38,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param code String
    * @param message String
    */
-  override fun reject(code: String, message: String?) {
+  override fun reject(code: String?, message: String?) {
     reject(code, message, null, null)
   }
 
@@ -48,7 +48,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param code String
    * @param throwable Throwable
    */
-  override fun reject(code: String, throwable: Throwable?) {
+  override fun reject(code: String?, throwable: Throwable?) {
     reject(code, null, throwable, null)
   }
 
@@ -59,7 +59,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param message String
    * @param throwable Throwable
    */
-  override fun reject(code: String, message: String?, throwable: Throwable?) {
+  override fun reject(code: String?, message: String?, throwable: Throwable?) {
     reject(code, message, throwable, null)
   }
 
@@ -94,7 +94,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param code String
    * @param userInfo WritableMap
    */
-  override fun reject(code: String, userInfo: WritableMap) {
+  override fun reject(code: String?, userInfo: WritableMap) {
     reject(code, null, null, userInfo)
   }
 
@@ -105,7 +105,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param throwable Throwable
    * @param userInfo WritableMap
    */
-  override fun reject(code: String, throwable: Throwable?, userInfo: WritableMap) {
+  override fun reject(code: String?, throwable: Throwable?, userInfo: WritableMap) {
     reject(code, null, throwable, userInfo)
   }
 
@@ -117,7 +117,7 @@ constructor(private var resolve: Callback?, private var reject: Callback?) : Pro
    * @param message String
    * @param userInfo WritableMap
    */
-  override fun reject(code: String, message: String?, userInfo: WritableMap) {
+  override fun reject(code: String?, message: String?, userInfo: WritableMap) {
     reject(code, message, null, userInfo)
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt

@@ -8,7 +8,6 @@
 package com.facebook.react.bridge
 
 import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import java.util.ArrayList
 import java.util.Arrays
 import kotlin.jvm.JvmStatic
@@ -90,17 +89,7 @@ public open class ReadableNativeArray protected constructor() : NativeArray(), R
 
   override fun hashCode(): Int = localArray.hashCode()
 
-  override fun equals(other: Any?): Boolean {
-    if (other !is ReadableNativeArray) {
-      return false
-    }
-
-    return if (ReactNativeFeatureFlags.useNativeEqualsInNativeReadableArrayAndroid()) {
-      nativeEquals(other)
-    } else {
-      localArray.contentDeepEquals(other.localArray)
-    }
-  }
+  override fun equals(other: Any?): Boolean = (other is ReadableNativeArray) && nativeEquals(other)
 
   private external fun nativeEquals(other: ReadableNativeArray): Boolean
 

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgelessDevSupportManager.kt

@@ -10,12 +10,12 @@ package com.facebook.react.devsupport
 import android.content.Context
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.SurfaceDelegateFactory
+import com.facebook.react.devsupport.inspector.TracingState
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
-import com.facebook.react.devsupport.interfaces.TracingState
 import com.facebook.react.packagerconnection.RequestHandler
 
 /**
@@ -23,9 +23,8 @@ import com.facebook.react.packagerconnection.RequestHandler
  * [DevSupportManagerBase] with some additional, more flexible APIs for asynchronously loading the
  * JS bundle.
  *
- * @constructor The primary constructor mirrors the same constructor we have for
- *   [BridgeDevSupportManager] and
- *     * is kept for backward compatibility.
+ * @constructor The primary constructor mirrors the same constructor we had for
+ *   `BridgeDevSupportManager` and is kept for backward compatibility.
  */
 internal class BridgelessDevSupportManager(
     applicationContext: Context,
@@ -83,6 +82,6 @@ internal class BridgelessDevSupportManager(
   }
 
   fun tracingState(): TracingState {
-    return TracingState.ENABLEDINCDPMODE
+    return TracingState.ENABLED_IN_CDP_MODE
   }
 }