react-native-tvos 0.73.7-1 → 0.74.0-0

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/RequestBodyUtil.java

@@ -11,7 +11,6 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.os.Build;
 import android.util.Base64;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
@@ -90,27 +89,11 @@ import okio.Source;
     file.deleteOnExit();
 
     final URL url = new URL(uri.toString());
-    final InputStream is = url.openStream();
-    try {
-      final ReadableByteChannel channel = Channels.newChannel(is);
-      try {
-        final FileOutputStream stream = new FileOutputStream(file);
-        try {
-          long maxBytes = Long.MAX_VALUE;
-          if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
-            // Old version of Android internally cast value to integer
-            maxBytes = (long) Integer.MAX_VALUE;
-          }
-          stream.getChannel().transferFrom(channel, 0, maxBytes);
-          return new FileInputStream(file);
-        } finally {
-          stream.close();
-        }
-      } finally {
-        channel.close();
-      }
-    } finally {
-      is.close();
+    try (FileOutputStream stream = new FileOutputStream(file);
+        InputStream is = url.openStream();
+        ReadableByteChannel channel = Channels.newChannel(is)) {
+      stream.getChannel().transferFrom(channel, 0, Long.MAX_VALUE);
+      return new FileInputStream(file);
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.java

@@ -10,8 +10,6 @@ package com.facebook.react.modules.permissions;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Process;
 import android.util.SparseArray;
 import com.facebook.common.logging.FLog;
 import com.facebook.fbreact.specs.NativePermissionsAndroidSpec;
@@ -49,12 +47,6 @@ public class PermissionsModule extends NativePermissionsAndroidSpec implements P
   @Override
   public void checkPermission(final String permission, final Promise promise) {
     Context context = getReactApplicationContext().getBaseContext();
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-      promise.resolve(
-          context.checkPermission(permission, Process.myPid(), Process.myUid())
-              == PackageManager.PERMISSION_GRANTED);
-      return;
-    }
     promise.resolve(context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED);
   }
 
@@ -68,10 +60,6 @@ public class PermissionsModule extends NativePermissionsAndroidSpec implements P
    */
   @Override
   public void shouldShowRequestPermissionRationale(final String permission, final Promise promise) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-      promise.resolve(false);
-      return;
-    }
     try {
       promise.resolve(
           getPermissionAwareActivity().shouldShowRequestPermissionRationale(permission));
@@ -89,14 +77,6 @@ public class PermissionsModule extends NativePermissionsAndroidSpec implements P
   @Override
   public void requestPermission(final String permission, final Promise promise) {
     Context context = getReactApplicationContext().getBaseContext();
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-      promise.resolve(
-          context.checkPermission(permission, Process.myPid(), Process.myUid())
-                  == PackageManager.PERMISSION_GRANTED
-              ? GRANTED
-              : DENIED);
-      return;
-    }
     if (context.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED) {
       promise.resolve(GRANTED);
       return;
@@ -142,15 +122,7 @@ public class PermissionsModule extends NativePermissionsAndroidSpec implements P
     for (int i = 0; i < permissions.size(); i++) {
       String perm = permissions.getString(i);
 
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-        grantedPermissions.putString(
-            perm,
-            context.checkPermission(perm, Process.myPid(), Process.myUid())
-                    == PackageManager.PERMISSION_GRANTED
-                ? GRANTED
-                : DENIED);
-        checkedPermissionsCount++;
-      } else if (context.checkSelfPermission(perm) == PackageManager.PERMISSION_GRANTED) {
+      if (context.checkSelfPermission(perm) == PackageManager.PERMISSION_GRANTED) {
         grantedPermissions.putString(perm, GRANTED);
         checkedPermissionsCount++;
       } else {
@@ -200,8 +172,13 @@ public class PermissionsModule extends NativePermissionsAndroidSpec implements P
   public boolean onRequestPermissionsResult(
       int requestCode, String[] permissions, int[] grantResults) {
     try {
-      mCallbacks.get(requestCode).invoke(grantResults, getPermissionAwareActivity());
-      mCallbacks.remove(requestCode);
+      Callback callback = mCallbacks.get(requestCode);
+      if (callback != null) {
+        callback.invoke(grantResults, getPermissionAwareActivity());
+        mCallbacks.remove(requestCode);
+      } else {
+        FLog.w("PermissionsModule", "Unable to find callback with requestCode %d", requestCode);
+      }
       return mCallbacks.size() == 0;
     } catch (IllegalStateException e) {
       FLog.e(

package/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java

@@ -194,7 +194,7 @@ public class StatusBarModule extends NativeStatusBarManagerAndroidSpec {
                 insetsController.setSystemBarsAppearance(
                     0, WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS);
               }
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            } else {
               View decorView = activity.getWindow().getDecorView();
               int systemUiVisibilityFlags = decorView.getSystemUiVisibility();
               if ("dark-content".equals(style)) {

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.java

@@ -52,10 +52,6 @@ public class AndroidInfoHelpers {
     return getAdbReverseTcpCommand(getDevServerPort(context));
   }
 
-  public static String getInspectorProxyHost(Context context) {
-    return getServerIpAddress(getInspectorProxyPort(context));
-  }
-
   // WARNING(festevezga): This RN helper method has been copied to another FB-only target. Any
   // changes should be applied to both.
   public static String getFriendlyDeviceName() {
@@ -72,11 +68,6 @@ public class AndroidInfoHelpers {
     return resources.getInteger(R.integer.react_native_dev_server_port);
   }
 
-  private static Integer getInspectorProxyPort(Context context) {
-    Resources resources = context.getResources();
-    return resources.getInteger(R.integer.react_native_dev_server_port);
-  }
-
   private static String getServerIpAddress(int port) {
     // Since genymotion runs in vbox it use different hostname to refer to adb host.
     // We detect whether app runs on genymotion and replace js bundle server hostname accordingly

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -1,10 +1,10 @@
 /**
- * @generated by scripts/set-rn-version.js
- *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * @generated by scripts/releases/set-rn-version.js
  */
 
 package com.facebook.react.modules.systeminfo;
@@ -16,7 +16,7 @@ import java.util.Map;
 public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
-      "minor", 73,
-      "patch", 7,
-      "prerelease", "1");
+      "minor", 74,
+      "patch", 0,
+      "prerelease", "0");
 }

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.java

@@ -12,6 +12,7 @@ import android.os.Looper;
 import android.util.Base64;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -20,6 +21,7 @@ import java.util.Iterator;
 import java.util.Map;
 import org.json.JSONObject;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class FileIoHandler implements Runnable {
   private static final String TAG = JSPackagerClient.class.getSimpleName();
   private static final long FILE_TTL = 30 * 1000;
@@ -104,12 +106,12 @@ public class FileIoHandler implements Runnable {
                 if (!(params instanceof Number)) {
                   throw new Exception("params must be a file handle");
                 }
-                TtlFileInputStream stream = mOpenFiles.get((int) params);
+                TtlFileInputStream stream = mOpenFiles.get(params);
                 if (stream == null) {
                   throw new Exception("invalid file handle, it might have timed out");
                 }
 
-                mOpenFiles.remove((int) params);
+                mOpenFiles.remove(params);
                 stream.close();
                 responder.respond("");
               } catch (Exception e) {

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/NotificationOnlyHandler.java

@@ -9,7 +9,9 @@ package com.facebook.react.packagerconnection;
 
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class NotificationOnlyHandler implements RequestHandler {
   private static final String TAG = JSPackagerClient.class.getSimpleName();
 

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.java

@@ -14,8 +14,10 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class PackagerConnectionSettings {
   private static final String TAG = PackagerConnectionSettings.class.getSimpleName();
   private static final String PREFS_DEBUG_SERVER_HOST_KEY = "debug_http_host";
@@ -57,10 +59,6 @@ public class PackagerConnectionSettings {
     mPreferences.edit().putString(PREFS_DEBUG_SERVER_HOST_KEY, host).apply();
   }
 
-  public String getInspectorServerHost() {
-    return AndroidInfoHelpers.getInspectorProxyHost(mAppContext);
-  }
-
   public @Nullable String getPackageName() {
     return mPackageName;
   }

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/RequestOnlyHandler.java

@@ -9,7 +9,9 @@ package com.facebook.react.packagerconnection;
 
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class RequestOnlyHandler implements RequestHandler {
   private static final String TAG = JSPackagerClient.class.getSimpleName();
 

package/ReactAndroid/src/main/java/com/facebook/react/processing/ReactPropertyProcessor.java

@@ -13,6 +13,7 @@ import static javax.lang.model.element.Modifier.PUBLIC;
 import static javax.tools.Diagnostic.Kind.ERROR;
 import static javax.tools.Diagnostic.Kind.WARNING;
 
+import com.facebook.annotationprocessors.common.ProcessorBase;
 import com.facebook.infer.annotation.SuppressFieldNotInitialized;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.DynamicFromObject;
@@ -40,7 +41,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
 import javax.annotation.processing.ProcessingEnvironment;
@@ -66,7 +66,7 @@ import javax.lang.model.util.Types;
  */
 @SupportedAnnotationTypes("com.facebook.react.uimanager.annotations.ReactPropertyHolder")
 @SupportedSourceVersion(SourceVersion.RELEASE_7)
-public class ReactPropertyProcessor extends AbstractProcessor {
+public class ReactPropertyProcessor extends ProcessorBase {
   private static final Map<TypeName, String> DEFAULT_TYPES;
   private static final Set<TypeName> BOXED_PRIMITIVES;
 
@@ -141,7 +141,7 @@ public class ReactPropertyProcessor extends AbstractProcessor {
   }
 
   @Override
-  public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+  public boolean processImpl(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
     // Clear properties from previous rounds
     mClasses.clear();
 
@@ -704,7 +704,7 @@ public class ReactPropertyProcessor extends AbstractProcessor {
 
     public ReactPropertyException(String message, PropertyInfo propertyInfo) {
       super(message);
-      this.element = propertyInfo.element;
+      element = propertyInfo.element;
     }
 
     public ReactPropertyException(String message, Element element) {

package/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/NativeModulePerfLogger.java

@@ -7,9 +7,11 @@
 
 package com.facebook.react.perflogger;
 
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.jni.HybridData;
 import com.facebook.soloader.SoLoader;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class NativeModulePerfLogger {
   private final HybridData mHybridData;
 

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BindingsInstaller.kt

@@ -13,8 +13,8 @@ import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.soloader.SoLoader
 
 @DoNotStripAny
-abstract class BindingsInstaller(@field:DoNotStrip private val mHybridData: HybridData?) {
-  companion object {
+public abstract class BindingsInstaller(@field:DoNotStrip private val mHybridData: HybridData?) {
+  private companion object {
     init {
       SoLoader.loadLibrary("rninstance")
     }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.runtime
+
+import android.content.res.AssetManager
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.bridge.CatalystInstance
+import com.facebook.react.bridge.JSIModule
+import com.facebook.react.bridge.JSIModuleSpec
+import com.facebook.react.bridge.JSIModuleType
+import com.facebook.react.bridge.JavaScriptContextHolder
+import com.facebook.react.bridge.JavaScriptModule
+import com.facebook.react.bridge.NativeArray
+import com.facebook.react.bridge.NativeArrayInterface
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.NativeModuleRegistry
+import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
+import com.facebook.react.bridge.RuntimeExecutor
+import com.facebook.react.bridge.RuntimeScheduler
+import com.facebook.react.bridge.UIManager
+import com.facebook.react.bridge.queue.ReactQueueConfiguration
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
+import com.facebook.react.common.annotations.VisibleForTesting
+import com.facebook.react.internal.turbomodule.core.interfaces.TurboModuleRegistry
+import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
+import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHolder
+
+@DoNotStrip
+@DeprecatedInNewArchitecture
+public class BridgelessCatalystInstance(private val reactHost: ReactHostImpl) : CatalystInstance {
+
+  override fun handleMemoryPressure(level: Int) {
+    throw UnsupportedOperationException("Unimplemented method 'handleMemoryPressure'")
+  }
+
+  override fun loadScriptFromAssets(
+      assetManager: AssetManager,
+      assetURL: String,
+      loadSynchronously: Boolean
+  ) {
+    throw UnsupportedOperationException("Unimplemented method 'loadScriptFromAssets'")
+  }
+
+  override fun loadScriptFromFile(fileName: String, sourceURL: String, loadSynchronously: Boolean) {
+    throw UnsupportedOperationException("Unimplemented method 'loadScriptFromFile'")
+  }
+
+  override fun loadSplitBundleFromFile(fileName: String, sourceURL: String) {
+    throw UnsupportedOperationException("Unimplemented method 'loadSplitBundleFromFile'")
+  }
+
+  override fun setSourceURLs(deviceURL: String, remoteURL: String) {
+    throw UnsupportedOperationException("Unimplemented method 'setSourceURLs'")
+  }
+
+  override fun runJSBundle() {
+    throw UnsupportedOperationException("Unimplemented method 'runJSBundle'")
+  }
+
+  override fun hasRunJSBundle(): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'hasRunJSBundle'")
+  }
+
+  override fun getSourceURL(): String? {
+    throw UnsupportedOperationException("Unimplemented method 'getSourceURL'")
+  }
+
+  @DoNotStrip
+  override fun invokeCallback(callbackID: Int, arguments: NativeArrayInterface) {
+    throw UnsupportedOperationException("Unimplemented method 'invokeCallback'")
+  }
+
+  override fun callFunction(module: String, method: String, arguments: NativeArray) {
+    throw UnsupportedOperationException("Unimplemented method 'callFunction'")
+  }
+
+  override fun destroy() {
+    throw UnsupportedOperationException("Unimplemented method 'destroy'")
+  }
+
+  override fun isDestroyed(): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'isDestroyed'")
+  }
+
+  @VisibleForTesting
+  override fun initialize() {
+    throw UnsupportedOperationException("Unimplemented method 'initialize'")
+  }
+
+  override fun getReactQueueConfiguration(): ReactQueueConfiguration {
+    throw UnsupportedOperationException("Unimplemented method 'getReactQueueConfiguration'")
+  }
+
+  override fun <T : JavaScriptModule> getJSModule(jsInterface: Class<T>): T {
+    throw UnsupportedOperationException("Unimplemented method 'getJSModule'")
+  }
+
+  override fun <T : NativeModule> hasNativeModule(nativeModuleInterface: Class<T>): Boolean {
+    throw UnsupportedOperationException("Unimplemented method 'hasNativeModule'")
+  }
+
+  override fun <T : NativeModule> getNativeModule(nativeModuleInterface: Class<T>): T? {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModule'")
+  }
+
+  override fun getNativeModule(moduleName: String): NativeModule? {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModule'")
+  }
+
+  @Deprecated(
+      message =
+          "getJSIModule(JSIModuleType moduleType) is deprecated and will be deleted in the future. Please use ReactInstanceEventListener to subscribe for react instance events instead.")
+  override fun getJSIModule(moduleType: JSIModuleType): JSIModule {
+    throw UnsupportedOperationException("Unimplemented method 'getJSIModule'")
+  }
+
+  override fun getNativeModules(): Collection<NativeModule> {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeModules'")
+  }
+
+  override fun extendNativeModules(modules: NativeModuleRegistry) {
+    throw UnsupportedOperationException("Unimplemented method 'extendNativeModules'")
+  }
+
+  override fun addBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
+    throw UnsupportedOperationException("Unimplemented method 'addBridgeIdleDebugListener'")
+  }
+
+  override fun removeBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
+    throw UnsupportedOperationException("Unimplemented method 'removeBridgeIdleDebugListener'")
+  }
+
+  override fun registerSegment(segmentId: Int, path: String) {
+    throw UnsupportedOperationException("Unimplemented method 'registerSegment'")
+  }
+
+  @VisibleForTesting
+  override fun setGlobalVariable(propName: String, jsonValue: String) {
+    throw UnsupportedOperationException("Unimplemented method 'setGlobalVariable'")
+  }
+
+  @Deprecated(message = "This API is unsupported in the New Architecture.")
+  override fun getJavaScriptContextHolder(): JavaScriptContextHolder? {
+    return reactHost.getJavaScriptContextHolder()
+  }
+
+  override fun getRuntimeExecutor(): RuntimeExecutor? {
+    return reactHost.getRuntimeExecutor()
+  }
+
+  override fun getRuntimeScheduler(): RuntimeScheduler {
+    throw UnsupportedOperationException("Unimplemented method 'getRuntimeScheduler'")
+  }
+
+  @Deprecated(message = "This API is unsupported in the New Architecture.")
+  override fun <T : JSIModule> addJSIModules(jsiModules: List<JSIModuleSpec<T>>) {
+    throw UnsupportedOperationException("Unimplemented method 'addJSIModules'")
+  }
+
+  override fun getJSCallInvokerHolder(): CallInvokerHolder? {
+    return reactHost.getJSCallInvokerHolder()
+  }
+
+  override fun getNativeMethodCallInvokerHolder(): NativeMethodCallInvokerHolder {
+    throw UnsupportedOperationException("Unimplemented method 'getNativeMethodCallInvokerHolder'")
+  }
+
+  @Deprecated(
+      message =
+          "setTurboModuleManager(JSIModule getter) is deprecated and will be deleted in the future. Please use setTurboModuleRegistry(TurboModuleRegistry turboModuleRegistry) instead.",
+      replaceWith = ReplaceWith("setTurboModuleRegistry(turboModuleRegistry)"))
+  override fun setTurboModuleManager(getter: JSIModule) {
+    throw UnsupportedOperationException("Unimplemented method 'setTurboModuleManager'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun setTurboModuleRegistry(turboModuleRegistry: TurboModuleRegistry) {
+    throw UnsupportedOperationException("Unimplemented method 'setTurboModuleRegistry'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun setFabricUIManager(fabricUIManager: UIManager) {
+    throw UnsupportedOperationException("Unimplemented method 'setFabricUIManager'")
+  }
+
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  override fun getFabricUIManager(): UIManager {
+    throw UnsupportedOperationException("Unimplemented method 'getFabricUIManager'")
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessDevSupportManager.java

@@ -9,12 +9,17 @@ package com.facebook.react.runtime;
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.Bundle;
 import android.view.View;
+import com.facebook.debug.holder.PrinterHolder;
+import com.facebook.debug.tags.ReactDebugOverlayTags;
+import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.devsupport.DevSupportManagerBase;
 import com.facebook.react.devsupport.HMRClient;
 import com.facebook.react.devsupport.ReactInstanceDevHelper;
@@ -92,8 +97,17 @@ class BridgelessDevSupportManager extends DevSupportManagerBase {
 
   @Override
   public void handleReloadJS() {
+    UiThreadUtil.assertOnUiThread();
+
+    // dismiss redbox if exists
     hideRedboxDialog();
     mReactHost.reload("BridgelessDevSupportManager.handleReloadJS()");
+
+    PrinterHolder.getPrinter()
+        .logMessage(ReactDebugOverlayTags.RN_CORE, "RNCore: load from Server");
+    String bundleURL =
+        getDevServerHelper().getDevServerBundleURL(Assertions.assertNotNull(getJSAppBundleName()));
+    reloadJSFromServer(bundleURL);
   }
 
   private static ReactInstanceDevHelper createInstanceDevHelper(final ReactHostImpl reactHost) {
@@ -105,7 +119,7 @@ class BridgelessDevSupportManager extends DevSupportManagerBase {
 
       @Override
       public void onJSBundleLoadedFromServer() {
-        throw new IllegalStateException("Not implemented for bridgeless mode");
+        // Not implemented
       }
 
       @Override
@@ -135,8 +149,7 @@ class BridgelessDevSupportManager extends DevSupportManagerBase {
         Activity currentActivity = getCurrentActivity();
         if (currentActivity != null && !reactHost.isSurfaceWithModuleNameAttached(appKey)) {
           ReactSurfaceImpl reactSurface =
-              ReactSurfaceImpl.createWithView(currentActivity, appKey, null);
-
+              ReactSurfaceImpl.createWithView(currentActivity, appKey, new Bundle());
           reactSurface.attach(reactHost);
           reactSurface.start();
 

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.java

@@ -8,20 +8,22 @@
 package com.facebook.react.runtime;
 
 import android.content.Context;
+import android.util.Log;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.CatalystInstance;
-import com.facebook.react.bridge.JSIModule;
-import com.facebook.react.bridge.JSIModuleType;
+import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.JavaScriptModuleRegistry;
 import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactNoCrashBridgeNotAllowedSoftException;
-import com.facebook.react.bridge.ReactSoftExceptionLogger;
+import com.facebook.react.bridge.RuntimeExecutor;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableNativeArray;
+import com.facebook.react.common.annotations.FrameworkAPI;
+import com.facebook.react.common.annotations.UnstableReactNativeAPI;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
@@ -75,22 +77,16 @@ class BridgelessReactContext extends ReactApplicationContext implements EventDis
   }
 
   @Override
-  public @Nullable JSIModule getJSIModule(JSIModuleType moduleType) {
-    if (moduleType == JSIModuleType.UIManager) {
-      return mReactHost.getUIManager();
-    }
-    throw new UnsupportedOperationException(
-        "getJSIModule is not implemented for bridgeless mode. Trying to get module: "
-            + moduleType.name());
+  public @Nullable UIManager getFabricUIManager() {
+    return mReactHost.getUIManager();
   }
 
   @Override
   public CatalystInstance getCatalystInstance() {
-    ReactSoftExceptionLogger.logSoftExceptionVerbose(
+    Log.w(
         TAG,
-        new ReactNoCrashBridgeNotAllowedSoftException(
-            "getCatalystInstance() cannot be called when the bridge is disabled"));
-    throw new UnsupportedOperationException("There is no Catalyst instance in bridgeless mode.");
+        "[WARNING] Bridgeless doesn't support CatalystInstance. Accessing an API that's not part of the new architecture is not encouraged usage.");
+    return new BridgelessCatalystInstance(mReactHost);
   }
 
   @Override
@@ -155,6 +151,23 @@ class BridgelessReactContext extends ReactApplicationContext implements EventDis
   public @Nullable <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface) {
     return mReactHost.getNativeModule(nativeModuleInterface);
   }
+  /**
+   * @return the RuntimeExecutor, a thread-safe handler for accessing the runtime. If the runtime is
+   *     not initialized yet, it will return null.
+   */
+  @Override
+  @FrameworkAPI
+  @UnstableReactNativeAPI
+  public @Nullable RuntimeExecutor getRuntimeExecutor() {
+    return mReactHost.getRuntimeExecutor();
+  }
+
+  @Override
+  @FrameworkAPI
+  @UnstableReactNativeAPI
+  public @Nullable JavaScriptContextHolder getJavaScriptContextHolder() {
+    return mReactHost.getJavaScriptContextHolder();
+  }
 
   @Override
   public void handleException(Exception e) {