react-native 0.71.3 → 0.72.0-rc.0

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);
     }
   }
 }

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

@@ -46,6 +46,7 @@ import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.devsupport.DevServerHelper.PackagerCommandListener;
 import com.facebook.react.devsupport.interfaces.BundleLoadCallback;
 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.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.ErrorCustomizer;
@@ -95,7 +96,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
   private final File mJSBundleDownloadedFile;
   private final File mJSSplitBundlesDir;
   private final DefaultJSExceptionHandler mDefaultJSExceptionHandler;
-  private final DevLoadingViewController mDevLoadingViewController;
+  private final DevLoadingViewManager mDevLoadingViewManager;
 
   private @Nullable SurfaceDelegate mRedBoxSurfaceDelegate;
   private @Nullable AlertDialog mDevOptionsDialog;
@@ -132,7 +133,8 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
       @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
-      @Nullable SurfaceDelegateFactory surfaceDelegateFactory) {
+      @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
+      @Nullable DevLoadingViewManager devLoadingViewManager) {
     mReactInstanceDevHelper = reactInstanceDevHelper;
     mApplicationContext = applicationContext;
     mJSAppBundleName = packagerPathForJSBundleName;
@@ -206,7 +208,10 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
     setDevSupportEnabled(enableOnCreate);
 
     mRedBoxHandler = redBoxHandler;
-    mDevLoadingViewController = new DevLoadingViewController(reactInstanceDevHelper);
+    mDevLoadingViewManager =
+        devLoadingViewManager != null
+            ? devLoadingViewManager
+            : new DefaultDevLoadingViewImplementation(reactInstanceDevHelper);
     mSurfaceDelegateFactory = surfaceDelegateFactory;
   };
 
@@ -752,19 +757,40 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
 
   @UiThread
   private void showDevLoadingViewForUrl(String bundleUrl) {
-    mDevLoadingViewController.showForUrl(bundleUrl);
+    if (mApplicationContext == null) {
+      return;
+    }
+
+    URL parsedURL;
+
+    try {
+      parsedURL = new URL(bundleUrl);
+    } 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();
+    mDevLoadingViewManager.showMessage(
+        mApplicationContext.getString(
+            R.string.catalyst_loading_from_url, parsedURL.getHost() + ":" + port));
     mDevLoadingViewVisible = true;
   }
 
   @UiThread
   protected void showDevLoadingViewForRemoteJSEnabled() {
-    mDevLoadingViewController.showForRemoteJSEnabled();
+    if (mApplicationContext == null) {
+      return;
+    }
+
+    mDevLoadingViewManager.showMessage(
+        mApplicationContext.getString(R.string.catalyst_debug_connecting));
     mDevLoadingViewVisible = true;
   }
 
   @UiThread
   protected void hideDevLoadingView() {
-    mDevLoadingViewController.hide();
+    mDevLoadingViewManager.hide();
     mDevLoadingViewVisible = false;
   }
 
@@ -806,7 +832,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
                   @Override
                   public void onProgress(
                       @Nullable String status, @Nullable Integer done, @Nullable Integer total) {
-                    mDevLoadingViewController.updateProgress(status, done, total);
+                    mDevLoadingViewManager.updateProgress(status, done, total);
                   }
 
                   @Override
@@ -947,7 +973,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
           public void onSuccess() {
             hideDevLoadingView();
             synchronized (DevSupportManagerBase.this) {
-              mBundleStatus.isLastDownloadSucess = true;
+              mBundleStatus.isLastDownloadSuccess = true;
               mBundleStatus.updateTimestamp = System.currentTimeMillis();
             }
             if (mBundleDownloadListener != null) {
@@ -962,7 +988,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
               @Nullable final String status,
               @Nullable final Integer done,
               @Nullable final Integer total) {
-            mDevLoadingViewController.updateProgress(status, done, total);
+            mDevLoadingViewManager.updateProgress(status, done, total);
             if (mBundleDownloadListener != null) {
               mBundleDownloadListener.onProgress(status, done, total);
             }
@@ -972,7 +998,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
           public void onFailure(final Exception cause) {
             hideDevLoadingView();
             synchronized (DevSupportManagerBase.this) {
-              mBundleStatus.isLastDownloadSucess = false;
+              mBundleStatus.isLastDownloadSuccess = false;
             }
             if (mBundleDownloadListener != null) {
               mBundleDownloadListener.onFailure(cause);
@@ -1104,7 +1130,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
 
       // show the dev loading if it should be
       if (mDevLoadingViewVisible) {
-        mDevLoadingViewController.showMessage("Reloading...");
+        mDevLoadingViewManager.showMessage("Reloading...");
       }
 
       mDevServerHelper.openPackagerConnection(
@@ -1185,7 +1211,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
       hideDevOptionsDialog();
 
       // hide loading view
-      mDevLoadingViewController.hide();
+      mDevLoadingViewManager.hide();
       mDevServerHelper.closePackagerConnection();
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.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;
@@ -26,5 +27,6 @@ public interface DevSupportManagerFactory {
       @Nullable DevBundleDownloadListener devBundleDownloadListener,
       int minNumShakes,
       @Nullable Map<String, RequestHandler> customPackagerCommandHandlers,
-      @Nullable SurfaceDelegateFactory surfaceDelegateFactory);
+      @Nullable SurfaceDelegateFactory surfaceDelegateFactory,
+      @Nullable DevLoadingViewManager devLoadingViewManager);
 }

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

@@ -157,7 +157,7 @@ public class InspectorPackagerConnection {
       jsonPage.put("title", page.getTitle());
       jsonPage.put("app", mPackageName);
       jsonPage.put("vm", page.getVM());
-      jsonPage.put("isLastBundleDownloadSuccess", bundleStatus.isLastDownloadSucess);
+      jsonPage.put("isLastBundleDownloadSuccess", bundleStatus.isLastDownloadSuccess);
       jsonPage.put("bundleUpdateTimestamp", bundleStatus.updateTimestamp);
       array.put(jsonPage);
     }
@@ -319,11 +319,11 @@ public class InspectorPackagerConnection {
   }
 
   public static class BundleStatus {
-    public Boolean isLastDownloadSucess;
+    public Boolean isLastDownloadSuccess;
     public long updateTimestamp = -1;
 
-    public BundleStatus(Boolean isLastDownloadSucess, long updateTimestamp) {
-      this.isLastDownloadSucess = isLastDownloadSucess;
+    public BundleStatus(Boolean isLastDownloadSuccess, long updateTimestamp) {
+      this.isLastDownloadSuccess = isLastDownloadSuccess;
       this.updateTimestamp = updateTimestamp;
     }
 

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

@@ -16,10 +16,8 @@ import java.io.File;
 
 // This module is being called only by Java via the static method "captureHeap" that
 // requires it to already be initialized, thus we eagerly initialize this module
-@ReactModule(name = JSCHeapCapture.TAG, needsEagerInit = true)
+@ReactModule(name = NativeJSCHeapCaptureSpec.NAME, needsEagerInit = true)
 public class JSCHeapCapture extends NativeJSCHeapCaptureSpec {
-  public static final String TAG = "JSCHeapCapture";
-
   public interface HeapCapture extends JavaScriptModule {
     void captureHeap(String path);
   }
@@ -79,9 +77,4 @@ public class JSCHeapCapture extends NativeJSCHeapCaptureSpec {
       mCaptureInProgress = null;
     }
   }
-
-  @Override
-  public String getName() {
-    return "JSCHeapCapture";
-  }
 }

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

@@ -15,7 +15,7 @@ import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.module.annotations.ReactModule;
 
-@ReactModule(name = LogBoxModule.NAME)
+@ReactModule(name = NativeLogBoxSpec.NAME)
 public class LogBoxModule extends NativeLogBoxSpec {
 
   public static final String NAME = "LogBox";
@@ -49,11 +49,6 @@ public class LogBoxModule extends NativeLogBoxSpec {
         });
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
   @Override
   public void show() {
     if (!mSurfaceDelegate.isContentViewReady()) {

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

@@ -0,0 +1,56 @@
+/*
+ * 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.devsupport;
+
+import android.content.Context;
+
+/**
+ * Interface for accessing and interacting with development features related to performance testing.
+ * Communication is enabled via the Inspector, but everything else is disabled.
+ */
+public final class PerftestDevSupportManager extends DisabledDevSupportManager {
+  private final DevServerHelper mDevServerHelper;
+  private final DevInternalSettings mDevSettings;
+  private final InspectorPackagerConnection.BundleStatus mBundleStatus;
+
+  public PerftestDevSupportManager(Context applicationContext) {
+    mDevSettings =
+        new DevInternalSettings(
+            applicationContext,
+            new DevInternalSettings.Listener() {
+              @Override
+              public void onInternalSettingsChanged() {}
+            });
+    mBundleStatus = new InspectorPackagerConnection.BundleStatus();
+    mDevServerHelper =
+        new DevServerHelper(
+            mDevSettings,
+            applicationContext.getPackageName(),
+            new InspectorPackagerConnection.BundleStatusProvider() {
+              @Override
+              public InspectorPackagerConnection.BundleStatus getBundleStatus() {
+                return mBundleStatus;
+              }
+            });
+  }
+
+  @Override
+  public DevInternalSettings getDevSettings() {
+    return mDevSettings;
+  }
+
+  @Override
+  public void startInspector() {
+    mDevServerHelper.openInspectorConnection();
+  }
+
+  @Override
+  public void stopInspector() {
+    mDevServerHelper.closeInspectorConnection();
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevLoadingViewManager.java

@@ -0,0 +1,21 @@
+/*
+ * 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.devsupport.interfaces;
+
+import androidx.annotation.Nullable;
+
+/** Interface to display loading messages on top of the screen. */
+public interface DevLoadingViewManager {
+
+  void showMessage(final String message);
+
+  void updateProgress(
+      final @Nullable String status, final @Nullable Integer done, final @Nullable Integer total);
+
+  void hide();
+}

package/ReactAndroid/src/main/java/com/facebook/react/fabric/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

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

@@ -16,13 +16,6 @@ rn_android_library(
         "pfh:ReactNative_CommonInfrastructurePlaceholder",
     ],
     language = "KOTLIN",
-    provided_deps = [
-        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-ui"),
-        react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
-    ],
     pure_kotlin = False,
     required_for_source_only_abi = True,
     source = "8",
@@ -32,23 +25,27 @@ rn_android_library(
     ],
     deps = [
         YOGA_TARGET,
-        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
         react_native_dep("java/com/facebook/systrace:systrace"),
         react_native_dep("libraries/fbcore/src/main/java/com/facebook/common/logging:logging"),
         react_native_dep("libraries/soloader/java/com/facebook/soloader:soloader"),
-        react_native_target("java/com/facebook/debug/tags:tags"),
+        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_target("java/com/facebook/debug/holder:holder"),
+        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/common/mapbuffer:mapbuffer"),
         react_native_target("java/com/facebook/react/config:config"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
         react_native_target("java/com/facebook/react/modules/i18nmanager:i18nmanager"),
-        react_native_target("java/com/facebook/react/common:common"),
-        react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
+        react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
-        react_native_target("java/com/facebook/react/views/view:view"),
         react_native_target("java/com/facebook/react/views/text:text"),
-        react_native_target("java/com/facebook/react/touch:touch"),
+        react_native_target("java/com/facebook/react/views/view:view"),
         react_native_target("jni/react/fabric:jni"),
     ] + KOTLIN_STDLIB_DEPS,
 )

package/ReactAndroid/src/main/java/com/facebook/react/fabric/Binding.java

@@ -9,7 +9,6 @@ package com.facebook.react.fabric;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
@@ -44,8 +43,7 @@ public class Binding {
       Object uiManager,
       EventBeatManager eventBeatManager,
       ComponentFactory componentsRegistry,
-      Object reactNativeConfig,
-      CppComponentRegistry cppComponentRegistry);
+      Object reactNativeConfig);
 
   public native void startSurface(
       int surfaceId, @NonNull String moduleName, @NonNull NativeMap initialProps);
@@ -87,29 +85,11 @@ public class Binding {
 
   public void register(
       @NonNull RuntimeExecutor runtimeExecutor,
-      @Nullable RuntimeScheduler runtimeScheduler,
+      @NonNull RuntimeScheduler runtimeScheduler,
       @NonNull FabricUIManager fabricUIManager,
       @NonNull EventBeatManager eventBeatManager,
       @NonNull ComponentFactory componentFactory,
       @NonNull ReactNativeConfig reactNativeConfig) {
-    register(
-        runtimeExecutor,
-        runtimeScheduler,
-        fabricUIManager,
-        eventBeatManager,
-        componentFactory,
-        reactNativeConfig,
-        null);
-  }
-
-  public void register(
-      @NonNull RuntimeExecutor runtimeExecutor,
-      @Nullable RuntimeScheduler runtimeScheduler,
-      @NonNull FabricUIManager fabricUIManager,
-      @NonNull EventBeatManager eventBeatManager,
-      @NonNull ComponentFactory componentFactory,
-      @NonNull ReactNativeConfig reactNativeConfig,
-      @Nullable CppComponentRegistry cppComponentRegistry) {
     fabricUIManager.setBinding(this);
     installFabricUIManager(
         runtimeExecutor,
@@ -117,8 +97,7 @@ public class Binding {
         fabricUIManager,
         eventBeatManager,
         componentFactory,
-        reactNativeConfig,
-        cppComponentRegistry);
+        reactNativeConfig);
 
     setPixelDensity(PixelUtil.getDisplayMetricDensity());
   }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java

@@ -21,8 +21,27 @@ import java.util.PriorityQueue;
 import java.util.Queue;
 
 class LongStreamingStats {
-  private Queue<Long> minHeap = new PriorityQueue<>(Comparator.naturalOrder());
-  private Queue<Long> maxHeap = new PriorityQueue<>(Comparator.reverseOrder());
+  // TODO(T138627466): Calculate median value with better algorithm after Android API 24.
+  private Queue<Long> minHeap =
+      new PriorityQueue<>(
+          11,
+          new Comparator<Long>() {
+            @Override
+            public int compare(Long first, Long second) {
+              // Natural order
+              return Long.compare(first, second);
+            }
+          });
+  private Queue<Long> maxHeap =
+      new PriorityQueue<>(
+          11,
+          new Comparator<Long>() {
+            @Override
+            public int compare(Long first, Long second) {
+              // Reversed order
+              return Long.compare(second, first);
+            }
+          });
   private double streamingAverage = 0.0;
   private int len = 0;
   private long max = 0;
@@ -161,7 +180,7 @@ public class DevToolsReactPerfLogger implements ReactMarker.FabricMarkerListener
       return getValue(FABRIC_UPDATE_UI_MAIN_THREAD_END);
     }
 
-    // Duration calcuations
+    // Duration calculations
     public long getCommitDuration() {
       return getCommitEnd() - getCommitStart();
     }