react-native-tvos 0.71.12-0 → 0.72.4-0rc0

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/MapBuffer.kt

@@ -21,7 +21,7 @@ package com.facebook.react.common.mapbuffer
  * Limitations:
  * - Keys are usually sized as 2 bytes, with each buffer supporting up to 65536 entries as a result.
  * - O(log(N)) random key access for native buffers due to selected structure. Faster access can be
- * achieved by retrieving [MapBuffer.Entry] with [entryAt] on known offsets.
+ *   achieved by retrieving [MapBuffer.Entry] with [entryAt] on known offsets.
  */
 interface MapBuffer : Iterable<MapBuffer.Entry> {
   companion object {
@@ -46,12 +46,14 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Number of elements inserted into current MapBuffer.
+   *
    * @return number of elements in the [MapBuffer]
    */
   val count: Int
 
   /**
    * Checks whether entry for given key exists in MapBuffer.
+   *
    * @param key key to lookup the entry
    * @return whether entry for the given key exists in the MapBuffer.
    */
@@ -60,6 +62,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
   /**
    * Provides offset of the key to use for [entryAt], for cases when offset is not statically known
    * but can be cached.
+   *
    * @param key key to lookup offset for
    * @return offset for the given key to be used for entry access, -1 if key wasn't found.
    */
@@ -67,14 +70,16 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed access to a MapBuffer without additional lookups for provided offset.
+   *
    * @param offset offset of entry in the MapBuffer structure. Can be looked up for known keys with
-   * [getKeyOffset].
+   *   [getKeyOffset].
    * @return parsed entry for structured access for given offset
    */
   fun entryAt(offset: Int): MapBuffer.Entry
 
   /**
    * Provides parsed [DataType] annotation associated with the given key.
+   *
    * @param key key to lookup type for
    * @return data type of the given key.
    * @throws IllegalArgumentException if the key doesn't exist
@@ -83,6 +88,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [Boolean] value if the entry for given key exists with [DataType.BOOL] type
+   *
    * @param key key to lookup [Boolean] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -92,6 +98,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [Int] value if the entry for given key exists with [DataType.INT] type
+   *
    * @param key key to lookup [Int] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -101,6 +108,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [Double] value if the entry for given key exists with [DataType.DOUBLE] type
+   *
    * @param key key to lookup [Double] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -110,6 +118,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [String] value if the entry for given key exists with [DataType.STRING] type
+   *
    * @param key key to lookup [String] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -119,6 +128,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
   /**
    * Provides parsed [MapBuffer] value if the entry for given key exists with [DataType.MAP] type
+   *
    * @param key key to lookup [MapBuffer] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -129,6 +139,7 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
   /**
    * Provides parsed [List<MapBuffer>] value if the entry for given key exists with [DataType.MAP]
    * type
+   *
    * @param key key to lookup [List<MapBuffer>] value for
    * @return value associated with the requested key
    * @throws IllegalArgumentException if the key doesn't exist
@@ -149,30 +160,35 @@ interface MapBuffer : Iterable<MapBuffer.Entry> {
 
     /**
      * Entry value represented as [Boolean]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.BOOL]
      */
     val booleanValue: Boolean
 
     /**
      * Entry value represented as [Int]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.INT]
      */
     val intValue: Int
 
     /**
      * Entry value represented as [Double]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.DOUBLE]
      */
     val doubleValue: Double
 
     /**
      * Entry value represented as [String]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.STRING]
      */
     val stringValue: String
 
     /**
      * Entry value represented as [MapBuffer]
+     *
      * @throws IllegalStateException if the data type doesn't match [DataType.MAP]
      */
     val mapBufferValue: MapBuffer

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.kt

@@ -66,7 +66,7 @@ class ReadableMapBuffer : MapBuffer {
   /**
    * @param key Key to search for
    * @return the "bucket index" for a key or -1 if not found. It uses a binary search algorithm
-   * (log(n))
+   *   (log(n))
    */
   private fun getBucketIndexForKey(intKey: Int): Int {
     if (intKey !in KEY_RANGE) {

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/WritableMapBuffer.kt

@@ -30,6 +30,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds a boolean value for given key to the MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range
@@ -38,6 +39,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds an int value for given key to the MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range
@@ -46,6 +48,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds a double value for given key to the MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range
@@ -54,6 +57,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds a string value for given key to the MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range
@@ -62,6 +66,7 @@ class WritableMapBuffer : MapBuffer {
 
   /**
    * Adds a [MapBuffer] value for given key to the current MapBuffer.
+   *
    * @param key entry key
    * @param value entry value
    * @throws IllegalArgumentException if key is out of [UShort] range

package/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java

@@ -25,12 +25,30 @@ public class ReactFeatureFlags {
    */
   public static volatile boolean useTurboModules = false;
 
+  /** In Bridgeless mode, should legacy NativeModules use the TurboModule system? */
+  public static volatile boolean unstable_useTurboModuleInterop = false;
+
   /**
    * Should this application use the new (Fabric) Renderer? If yes, all rendering in this app will
    * use Fabric instead of the legacy renderer.
    */
   public static volatile boolean enableFabricRenderer = false;
 
+  /**
+   * Should this application enable the Fabric Interop Layer for Android? If yes, the application
+   * will behave so that it can accept non-Fabric components and render them on Fabric. This toggle
+   * is controlling extra logic such as custom event dispatching that are needed for the Fabric
+   * Interop Layer to work correctly.
+   */
+  public static volatile boolean unstable_useFabricInterop = false;
+
+  /**
+   * Should this application always use the Native RuntimeScheduler? If yes, we'll be instantiating
+   * it over all the architectures (both Old and New). This is intentionally set to true as we want
+   * to use it more as a kill-switch to turn off this feature to potentially debug issues.
+   */
+  public static volatile boolean unstable_useRuntimeSchedulerAlways = true;
+
   /**
    * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable
    * the following flags: `useTurboModules` & `enableFabricRenderer`.
@@ -42,6 +60,9 @@ public class ReactFeatureFlags {
    */
   public static volatile boolean enableBridgelessArchitectureSoftExceptions = false;
 
+  /** Does the bridgeless architecture use the new create/reload/destroy routines */
+  public static volatile boolean enableBridgelessArchitectureNewCreateReloadDestroy = false;
+
   /**
    * After TurboModules and Fabric are enabled, we need to ensure that the legacy NativeModule isn't
    * isn't used. So, turn this flag on to trigger warnings whenever the legacy NativeModule system
@@ -52,26 +73,6 @@ public class ReactFeatureFlags {
   /** Should we dispatch TurboModule methods with promise returns to the NativeModules thread? */
   public static volatile boolean enableTurboModulePromiseAsyncDispatch = false;
 
-  /**
-   * Experiment:
-   *
-   * <p>Bridge and Bridgeless mode can run concurrently. This means that there can be two
-   * TurboModule systems alive at the same time.
-   *
-   * <p>The TurboModule system stores all JS callbacks in a global LongLivedObjectCollection. This
-   * collection is cleared when the JS VM is torn down. Implication: Tearing down the bridge JSVM
-   * invalidates the bridgeless JSVM's callbacks, and vice versa.
-   *
-   * <p>useGlobalCallbackCleanupScopeUsingRetainJSCallback => Use a retainJSCallbacks lambda to
-   * store jsi::Functions into the global LongLivedObjectCollection
-   *
-   * <p>useTurboModuleManagerCallbackCleanupScope => Use a retainJSCallbacks labmda to store
-   * jsi::Functions into a LongLivedObjectCollection owned by the TurboModuleManager
-   */
-  public static boolean useGlobalCallbackCleanupScopeUsingRetainJSCallback = false;
-
-  public static boolean useTurboModuleManagerCallbackCleanupScope = false;
-
   /** This feature flag enables logs for Fabric */
   public static boolean enableFabricLogs = false;
 
@@ -84,9 +85,6 @@ public class ReactFeatureFlags {
   /** Enables or disables calculation of Transformed Frames */
   public static boolean calculateTransformedFramesEnabled = false;
 
-  /** Feature Flag to use overflowInset values provided by Yoga */
-  public static boolean useOverflowInset = false;
-
   /**
    * Android TV: Send key down events as well as key up events. 
    * Enabling this flag will result in two 'select' TVRemoteEventHandler events
@@ -103,6 +101,9 @@ public class ReactFeatureFlags {
   /** Feature Flag to enable the pending event queue in fabric before mounting views */
   public static boolean enableFabricPendingEventQueue = false;
 
+  /** Feature Flag to enable caching mechanism of text measurement at shadow node level */
+  public static boolean enableTextMeasureCachePerShadowNode = false;
+
   /**
    * Feature flag that controls how turbo modules are exposed to JS
    *
@@ -132,6 +133,27 @@ public class ReactFeatureFlags {
   /** Temporary flag to allow execution of mount items up to 15ms earlier than normal. */
   public static boolean enableEarlyScheduledMountItemExecution = false;
 
-  // TODO (T136375139): Remove this once finish testing
-  public static boolean enableAtomicRegisterSegment = false;
+  /**
+   * Allow closing the small gap that appears between paths when drawing a rounded View with a
+   * border.
+   */
+  public static boolean enableCloseVisibleGapBetweenPaths = true;
+
+  /**
+   * Allow fix in layout animation to drop delete...create mutations which could cause missing view
+   * state in Fabric SurfaceMountingManager.
+   */
+  public static boolean reduceDeleteCreateMutationLayoutAnimation = true;
+
+  /**
+   * Allow fix to drop delete...create mutations which could cause missing view state in Fabric
+   * SurfaceMountingManager.
+   */
+  public static boolean reduceDeleteCreateMutation = false;
+
+  /**
+   * Use JSI NativeState API to store references to native objects rather than the more expensive
+   * HostObject pattern
+   */
+  public static boolean useNativeState = false;
 }

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt

@@ -27,23 +27,46 @@ object DefaultNewArchitectureEntryPoint {
   fun load(
       turboModulesEnabled: Boolean = true,
       fabricEnabled: Boolean = true,
-      concurrentReactEnabled: Boolean = true,
       dynamicLibraryName: String = "appmodules",
   ) {
     ReactFeatureFlags.useTurboModules = turboModulesEnabled
     ReactFeatureFlags.enableFabricRenderer = fabricEnabled
+    ReactFeatureFlags.unstable_useFabricInterop = fabricEnabled
 
-    this.fabricEnabled = fabricEnabled
-    this.turboModulesEnabled = turboModulesEnabled
-    this.concurrentReactEnabled = concurrentReactEnabled
+    this.privateFabricEnabled = fabricEnabled
+    this.privateTurboModulesEnabled = turboModulesEnabled
+    this.privateConcurrentReactEnabled = fabricEnabled
 
     SoLoader.loadLibrary("react_newarchdefaults")
     SoLoader.loadLibrary(dynamicLibraryName)
   }
 
-  @JvmStatic var fabricEnabled: Boolean = false
+  @Deprecated(
+      message =
+          "Calling DefaultNewArchitectureEntryPoint.load() with different fabricEnabled and concurrentReactEnabled is deprecated. Please use a single flag for both Fabric and Concurrent React",
+      replaceWith = ReplaceWith("load(turboModulesEnabled, fabricEnabled, dynamicLibraryName)"),
+      level = DeprecationLevel.WARNING)
+  fun load(
+      turboModulesEnabled: Boolean = true,
+      fabricEnabled: Boolean = true,
+      @Suppress("UNUSED_PARAMETER") concurrentReactEnabled: Boolean = true,
+      dynamicLibraryName: String = "appmodules",
+  ) {
+    load(turboModulesEnabled, fabricEnabled, dynamicLibraryName)
+  }
 
-  @JvmStatic var turboModulesEnabled: Boolean = false
+  private var privateFabricEnabled: Boolean = false
+  @JvmStatic
+  val fabricEnabled: Boolean
+    get() = privateFabricEnabled
 
-  @JvmStatic var concurrentReactEnabled: Boolean = false
+  private var privateTurboModulesEnabled: Boolean = false
+  @JvmStatic
+  val turboModulesEnabled: Boolean
+    get() = privateTurboModulesEnabled
+
+  private var privateConcurrentReactEnabled: Boolean = false
+  @JvmStatic
+  val concurrentReactEnabled: Boolean
+    get() = privateConcurrentReactEnabled
 }

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactActivityDelegate.kt

@@ -7,6 +7,7 @@
 
 package com.facebook.react.defaults
 
+import android.os.Bundle
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.ReactRootView
@@ -15,32 +16,35 @@ import com.facebook.react.ReactRootView
  * A utility class that allows you to simplify the setup of a [ReactActivityDelegate] for new apps
  * in Open Source.
  *
- * Specifically, with this class you can simply control if Fabric and Concurrent Root are enabled
- * for an Activity using the boolean flags in the constructor.
+ * Specifically, with this class you can simply control if Fabric is enabled for an Activity using
+ * the boolean flag in the constructor.
  *
  * @param fabricEnabled Whether Fabric should be enabled for the RootView of this Activity.
- * @param concurrentRootEnabled Whether ConcurrentRoot (aka React 18) should be enabled for the
- * RootView of this Activity.
  */
 open class DefaultReactActivityDelegate(
     activity: ReactActivity,
     mainComponentName: String,
     private val fabricEnabled: Boolean = false,
-    private val concurrentRootEnabled: Boolean = false
 ) : ReactActivityDelegate(activity, mainComponentName) {
 
-  /**
-   * Override this method to enable Concurrent Root on the surface for this Activity. See:
-   * https://reactjs.org/blog/2022/03/29/react-v18.html
-   *
-   * This requires to be rendering on Fabric (i.e. on the New Architecture).
-   *
-   * @return Whether you want to enable Concurrent Root for this surface or not.
-   */
-  override fun isConcurrentRootEnabled(): Boolean {
-    return concurrentRootEnabled
-  }
+  @Deprecated(
+      message =
+          "Creating DefaultReactActivityDelegate with both fabricEnabled and concurrentReactEnabled is deprecated. Please pass only one boolean value that will be used for both flags",
+      level = DeprecationLevel.WARNING,
+      replaceWith =
+          ReplaceWith("DefaultReactActivityDelegate(activity, mainComponentName, fabricEnabled)"))
+  constructor(
+      activity: ReactActivity,
+      mainComponentName: String,
+      fabricEnabled: Boolean,
+      @Suppress("UNUSED_PARAMETER") concurrentReactEnabled: Boolean,
+  ) : this(activity, mainComponentName, fabricEnabled)
+
+  override fun isFabricEnabled(): Boolean = fabricEnabled
 
   override fun createRootView(): ReactRootView =
       ReactRootView(context).apply { setIsFabric(fabricEnabled) }
+
+  override fun createRootView(bundle: Bundle?): ReactRootView =
+      ReactRootView(context).apply { setIsFabric(fabricEnabled) }
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK

@@ -9,28 +9,23 @@ rn_android_library(
     ],
     language = "JAVA",
     manifest = "AndroidManifest.xml",
-    provided_deps = [
-        react_native_dep("third-party/android/androidx:core"),
-        react_native_dep("third-party/android/androidx:fragment"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-ui"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
-    ],
     visibility = [
         "PUBLIC",
     ],
     deps = [
-        react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
+        react_native_dep("third-party/android/androidx:annotation"),
+        react_native_dep("third-party/android/androidx:core"),
+        react_native_dep("third-party/android/androidx:fragment"),
+        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
         react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_dep("third-party/java/okhttp:okhttp3"),
         react_native_dep("third-party/java/okio:okio"),
         react_native_target("java/com/facebook/debug/holder:holder"),
-        react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/common:common"),
-        react_native_target("java/com/facebook/react/util:util"),
         react_native_target("java/com/facebook/react/common/network:network"),
         react_native_target("java/com/facebook/react/devsupport:interfaces"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
@@ -39,6 +34,8 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/debug:interfaces"),
         react_native_target("java/com/facebook/react/modules/systeminfo:systeminfo"),
         react_native_target("java/com/facebook/react/packagerconnection:packagerconnection"),
+        react_native_target("java/com/facebook/react/uimanager:uimanager"),
+        react_native_target("java/com/facebook/react/util:util"),
         react_native_target("res:devsupport"),
     ],
     exported_deps = [

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

@@ -25,6 +25,7 @@ import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.common.futures.SimpleSettableFuture;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
+import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
 import com.facebook.react.devsupport.interfaces.DevOptionHandler;
 import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
 import com.facebook.react.devsupport.interfaces.RedBoxHandler;
@@ -64,6 +65,8 @@ import java.util.concurrent.TimeoutException;
  */
 public final class BridgeDevSupportManager extends DevSupportManagerBase {
   private boolean mIsSamplingProfilerEnabled = false;
+  private ReactInstanceDevHelper mReactInstanceManagerHelper;
+  private @Nullable DevLoadingViewManager mDevLoadingViewManager;
 
   public BridgeDevSupportManager(
       Context applicationContext,
@@ -74,7 +77,8 @@ public final class BridgeDevSupportManager extends DevSupportManagerBase {
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
       @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
-      @Nullable SurfaceDelegateFactory surfaceDelegateFactory) {
+      @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
+      @Nullable DevLoadingViewManager devLoadingViewManager) {
     super(
         applicationContext,
         reactInstanceManagerHelper,
@@ -84,7 +88,11 @@ public final class BridgeDevSupportManager extends DevSupportManagerBase {
         devBundleDownloadListener,
         minNumShakes,
         customPackagerCommandHandlers,
-        surfaceDelegateFactory);
+        surfaceDelegateFactory,
+        devLoadingViewManager);
+
+    mReactInstanceManagerHelper = reactInstanceManagerHelper;
+    mDevLoadingViewManager = devLoadingViewManager;
 
     if (getDevSettings().isStartSamplingProfilerOnInit()) {
       // Only start the profiler. If its already running, there is an error
@@ -125,6 +133,14 @@ public final class BridgeDevSupportManager extends DevSupportManagerBase {
     }
   }
 
+  public DevLoadingViewManager getDevLoadingViewManager() {
+    return mDevLoadingViewManager;
+  }
+
+  public ReactInstanceDevHelper getReactInstanceManagerHelper() {
+    return mReactInstanceManagerHelper;
+  }
+
   @Override
   protected String getUniqueTag() {
     return "Bridge";

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/{DevLoadingViewController.java → DefaultDevLoadingViewImplementation.java}

@@ -22,12 +22,14 @@ import com.facebook.common.logging.FLog;
 import com.facebook.react.R;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
-import java.net.MalformedURLException;
-import java.net.URL;
+import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
 import java.util.Locale;
 
-/** Controller to display loading messages on top of the screen. All methods are thread safe. */
-public class DevLoadingViewController {
+/**
+ * Default implementation of Dev Loading View Manager to display loading messages on top of the
+ * screen. All methods are thread safe.
+ */
+public class DefaultDevLoadingViewImplementation implements DevLoadingViewManager {
   private static boolean sEnabled = true;
   private final ReactInstanceDevHelper mReactInstanceManagerHelper;
   private @Nullable TextView mDevLoadingView;
@@ -37,10 +39,11 @@ public class DevLoadingViewController {
     sEnabled = enabled;
   }
 
-  public DevLoadingViewController(ReactInstanceDevHelper reactInstanceManagerHelper) {
+  public DefaultDevLoadingViewImplementation(ReactInstanceDevHelper reactInstanceManagerHelper) {
     mReactInstanceManagerHelper = reactInstanceManagerHelper;
   }
 
+  @Override
   public void showMessage(final String message) {
     if (!sEnabled) {
       return;
@@ -55,34 +58,7 @@ public class DevLoadingViewController {
         });
   }
 
-  public void showForUrl(String url) {
-    Context context = getContext();
-    if (context == null) {
-      return;
-    }
-
-    URL parsedURL;
-    try {
-      parsedURL = new URL(url);
-    } catch (MalformedURLException e) {
-      FLog.e(ReactConstants.TAG, "Bundle url format is invalid. \n\n" + e.toString());
-      return;
-    }
-
-    int port = parsedURL.getPort() != -1 ? parsedURL.getPort() : parsedURL.getDefaultPort();
-    showMessage(
-        context.getString(R.string.catalyst_loading_from_url, parsedURL.getHost() + ":" + port));
-  }
-
-  public void showForRemoteJSEnabled() {
-    Context context = getContext();
-    if (context == null) {
-      return;
-    }
-
-    showMessage(context.getString(R.string.catalyst_debug_connecting));
-  }
-
+  @Override
   public void updateProgress(
       final @Nullable String status, final @Nullable Integer done, final @Nullable Integer total) {
     if (!sEnabled) {
@@ -107,6 +83,7 @@ public class DevLoadingViewController {
         });
   }
 
+  @Override
   public void hide() {
     if (!sEnabled) {
       return;

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.java

@@ -11,6 +11,7 @@ import android.content.Context;
 import androidx.annotation.Nullable;
 import com.facebook.react.common.SurfaceDelegateFactory;
 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.RedBoxHandler;
 import com.facebook.react.packagerconnection.RequestHandler;
@@ -28,6 +29,8 @@ public class DefaultDevSupportManagerFactory implements DevSupportManagerFactory
   private static final String DEVSUPPORT_IMPL_PACKAGE = "com.facebook.react.devsupport";
   private static final String DEVSUPPORT_IMPL_CLASS = "BridgeDevSupportManager";
 
+  /** @deprecated in favor of the customisable create for DevSupportManagerFactory */
+  @Deprecated
   public DevSupportManager create(
       Context applicationContext,
       ReactInstanceDevHelper reactInstanceDevHelper,
@@ -44,6 +47,7 @@ public class DefaultDevSupportManagerFactory implements DevSupportManagerFactory
         null,
         minNumShakes,
         null,
+        null,
         null);
   }
 
@@ -57,10 +61,15 @@ public class DefaultDevSupportManagerFactory implements DevSupportManagerFactory
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
       @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
-      @Nullable SurfaceDelegateFactory surfaceDelegateFactory) {
+      @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
+      @Nullable DevLoadingViewManager devLoadingViewManager) {
     if (!enableOnCreate) {
       return new DisabledDevSupportManager();
     }
+    // Developer support is enabled, we now must choose whether to return a DevSupportManager,
+    // or a more lean profiling-only PerftestDevSupportManager. We make the choice by first
+    // trying to return the full support DevSupportManager and if it fails, then just
+    // return PerftestDevSupportManager.
     try {
       // ProGuard is surprisingly smart in this case and will keep a class if it detects a call to
       // Class.forName() with a static string. So instead we generate a quasi-dynamic string to
@@ -81,7 +90,8 @@ public class DefaultDevSupportManagerFactory implements DevSupportManagerFactory
               DevBundleDownloadListener.class,
               int.class,
               Map.class,
-              SurfaceDelegateFactory.class);
+              SurfaceDelegateFactory.class,
+              DevLoadingViewManager.class);
       return (DevSupportManager)
           constructor.newInstance(
               applicationContext,
@@ -92,12 +102,10 @@ public class DefaultDevSupportManagerFactory implements DevSupportManagerFactory
               devBundleDownloadListener,
               minNumShakes,
               customPackagerCommandHandlers,
-              surfaceDelegateFactory);
+              surfaceDelegateFactory,
+              devLoadingViewManager);
     } catch (Exception e) {
-      throw new RuntimeException(
-          "Requested enabled DevSupportManager, but BridgeDevSupportManager class was not found"
-              + " or could not be created",
-          e);
+      return new PerftestDevSupportManager(applicationContext);
     }
   }
 }