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

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

@@ -23,8 +23,11 @@ import android.os.Build;
 import android.util.Pair;
 import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.ListAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
@@ -40,6 +43,7 @@ import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.DebugServerException;
+import com.facebook.react.common.JavascriptException;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.ShakeDetector;
 import com.facebook.react.common.SurfaceDelegate;
@@ -62,10 +66,12 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 public abstract class DevSupportManagerBase implements DevSupportManager {
 
@@ -103,6 +109,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
   private boolean mIsReceiverRegistered = false;
   private boolean mIsShakeDetectorStarted = false;
   private boolean mIsDevSupportEnabled = false;
+  private boolean mIsPackagerConnected;
   private @Nullable final RedBoxHandler mRedBoxHandler;
   private @Nullable String mLastErrorTitle;
   private @Nullable StackFrame[] mLastErrorStack;
@@ -112,8 +119,6 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
   private @Nullable List<ErrorCustomizer> mErrorCustomizers;
   private @Nullable PackagerLocationCustomizer mPackagerLocationCustomizer;
 
-  private final InspectorPackagerConnection.BundleStatus mBundleStatus;
-
   private @Nullable final Map<String, RequestHandler> mCustomPackagerCommandHandlers;
 
   private @Nullable final SurfaceDelegateFactory mSurfaceDelegateFactory;
@@ -133,12 +138,10 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
     mApplicationContext = applicationContext;
     mJSAppBundleName = packagerPathForJSBundleName;
     mDevSettings = new DevInternalSettings(applicationContext, this::reloadSettings);
-    mBundleStatus = new InspectorPackagerConnection.BundleStatus();
     mDevServerHelper =
         new DevServerHelper(
             mDevSettings,
             mApplicationContext.getPackageName(),
-            () -> mBundleStatus,
             mDevSettings.getPackagerConnectionSettings());
     mBundleDownloadListener = devBundleDownloadListener;
 
@@ -210,13 +213,10 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
       cause = cause.getCause();
     }
 
-    if (e instanceof JSException) {
+    if (e instanceof JavascriptException) {
       FLog.e(ReactConstants.TAG, "Exception in native call from JS", e);
-      String stack = ((JSException) e).getStack();
-      message.append("\n\n").append(stack);
-
-      // TODO #11638796: convert the stack into something useful
-      showNewError(message.toString(), new StackFrame[] {}, JSEXCEPTION_ERROR_COOKIE, ErrorType.JS);
+      showNewError(
+          e.getMessage().toString(), new StackFrame[] {}, JSEXCEPTION_ERROR_COOKIE, ErrorType.JS);
     } else {
       showNewJavaError(message.toString(), e);
     }
@@ -346,6 +346,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
       return;
     }
     LinkedHashMap<String, DevOptionHandler> options = new LinkedHashMap<>();
+    Set<String> disabledItemKeys = new HashSet<>();
     /* register standard options */
     options.put(
         mApplicationContext.getString(R.string.catalyst_reload),
@@ -375,8 +376,15 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
 
     if (mDevSettings.isDeviceDebugEnabled() && !mDevSettings.isRemoteJSDebugEnabled()) {
       // On-device JS debugging (CDP). Render action to open debugger frontend.
+      boolean isConnected = mIsPackagerConnected;
+      String debuggerItemString =
+          mApplicationContext.getString(
+              isConnected ? R.string.catalyst_debug_open : R.string.catalyst_debug_open_disabled);
+      if (!isConnected) {
+        disabledItemKeys.add(debuggerItemString);
+      }
       options.put(
-          mApplicationContext.getString(R.string.catalyst_debug_open),
+          debuggerItemString,
           () ->
               mDevServerHelper.openDebugger(
                   mCurrentContext,
@@ -416,9 +424,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
         });
 
     options.put(
-        mDevSettings.isElementInspectorEnabled()
-            ? mApplicationContext.getString(R.string.catalyst_inspector_stop)
-            : mApplicationContext.getString(R.string.catalyst_inspector),
+        mApplicationContext.getString(R.string.catalyst_inspector_toggle),
         new DevOptionHandler() {
           @Override
           public void onOptionSelected() {
@@ -513,11 +519,33 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
       header.addView(jsExecutorLabel);
     }
 
+    ListAdapter adapter =
+        new ArrayAdapter<String>(
+            context, android.R.layout.simple_list_item_1, options.keySet().toArray(new String[0])) {
+          @Override
+          public boolean areAllItemsEnabled() {
+            return false;
+          }
+
+          @Override
+          public boolean isEnabled(int position) {
+            return !disabledItemKeys.contains(getItem(position));
+          }
+
+          @Override
+          public View getView(int position, @Nullable View convertView, ViewGroup parent) {
+            View view = super.getView(position, convertView, parent);
+            view.setEnabled(isEnabled(position));
+
+            return view;
+          }
+        };
+
     mDevOptionsDialog =
         new AlertDialog.Builder(context)
             .setCustomTitle(header)
-            .setItems(
-                options.keySet().toArray(new String[0]),
+            .setAdapter(
+                adapter,
                 (dialog, which) -> {
                   optionHandlers[which].onOptionSelected();
                   mDevOptionsDialog = null;
@@ -890,10 +918,6 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
           @Override
           public void onSuccess() {
             hideDevLoadingView();
-            synchronized (DevSupportManagerBase.this) {
-              mBundleStatus.isLastDownloadSuccess = true;
-              mBundleStatus.updateTimestamp = System.currentTimeMillis();
-            }
             if (mBundleDownloadListener != null) {
               mBundleDownloadListener.onSuccess();
             }
@@ -915,9 +939,6 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
           @Override
           public void onFailure(final Exception cause) {
             hideDevLoadingView();
-            synchronized (DevSupportManagerBase.this) {
-              mBundleStatus.isLastDownloadSuccess = false;
-            }
             if (mBundleDownloadListener != null) {
               mBundleDownloadListener.onFailure(cause);
             }
@@ -1037,18 +1058,20 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
           new PackagerCommandListener() {
             @Override
             public void onPackagerConnected() {
-              // No-op
+              mIsPackagerConnected = true;
             }
 
             @Override
             public void onPackagerDisconnected() {
-              // No-op
+              mIsPackagerConnected = false;
             }
 
             @Override
             public void onPackagerReloadCommand() {
-              // Disable debugger to resume the JsVM & avoid thread locks while reloading
-              mDevServerHelper.disableDebugger();
+              if (!InspectorFlags.getEnableModernCDPRegistry()) {
+                // Disable debugger to resume the JsVM & avoid thread locks while reloading
+                mDevServerHelper.disableDebugger();
+              }
               UiThreadUtil.runOnUiThread(() -> handleReloadJS());
             }
 

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

@@ -0,0 +1,24 @@
+/*
+ * 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 com.facebook.infer.annotation.Nullsafe;
+import com.facebook.soloader.SoLoader;
+
+@Nullsafe(Nullsafe.Mode.LOCAL)
+class DevSupportSoLoader {
+  private static volatile boolean sDidInit = false;
+
+  public static synchronized void staticInit() {
+    if (sDidInit) {
+      return;
+    }
+    SoLoader.loadLibrary("react_devsupportjni");
+    sDidInit = true;
+  }
+}

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

@@ -11,11 +11,13 @@ import android.os.Handler;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.EditText;
+import com.facebook.infer.annotation.Nullsafe;
 
 /**
  * A class allows recognizing double key tap of "R", used to reload JS in {@link
  * AbstractReactActivity}, {@link RedBoxDialogSurfaceDelegate} and {@link ReactActivity}.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class DoubleTapReloadRecognizer {
   private boolean mDoRefresh = false;
   private static final long DOUBLE_TAP_DELAY = 200;

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

@@ -22,7 +22,7 @@ import java.util.Locale;
  *
  * <p>NB: Requires API 16 for use of FpsDebugFrameCallback.
  */
-public class FpsView extends FrameLayout {
+class FpsView extends FrameLayout {
 
   private static final int UPDATE_INTERVAL_MS = 500;
 

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

@@ -0,0 +1,16 @@
+/*
+ * 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;
+
+/* package */ interface IInspectorPackagerConnection {
+  public void connect();
+
+  public void closeQuietly();
+
+  public void sendEventToAllConnections(String event);
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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 com.facebook.infer.annotation.Nullsafe;
+import com.facebook.proguard.annotations.DoNotStrip;
+
+/** JNI wrapper for `jsinspector_modern::InspectorFlags`. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
+@DoNotStrip
+public class InspectorFlags {
+  static {
+    DevSupportSoLoader.staticInit();
+  }
+
+  @DoNotStrip
+  public static native boolean getEnableModernCDPRegistry();
+
+  @DoNotStrip
+  public static native boolean getEnableCxxInspectorPackagerConnection();
+
+  private InspectorFlags() {}
+}

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

@@ -27,20 +27,17 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class InspectorPackagerConnection {
+public class InspectorPackagerConnection implements IInspectorPackagerConnection {
   private static final String TAG = "InspectorPackagerConnection";
 
   private final Connection mConnection;
   private final Map<String, Inspector.LocalConnection> mInspectorConnections;
   private final String mPackageName;
-  private BundleStatusProvider mBundleStatusProvider;
 
-  public InspectorPackagerConnection(
-      String url, String packageName, BundleStatusProvider bundleStatusProvider) {
+  public InspectorPackagerConnection(String url, String packageName) {
     mConnection = new Connection(url);
     mInspectorConnections = new HashMap<>();
     mPackageName = packageName;
-    mBundleStatusProvider = bundleStatusProvider;
   }
 
   public void connect() {
@@ -150,15 +147,12 @@ public class InspectorPackagerConnection {
   private JSONArray getPages() throws JSONException {
     List<Inspector.Page> pages = Inspector.getPages();
     JSONArray array = new JSONArray();
-    BundleStatus bundleStatus = mBundleStatusProvider.getBundleStatus();
     for (Inspector.Page page : pages) {
       JSONObject jsonPage = new JSONObject();
       jsonPage.put("id", String.valueOf(page.getId()));
       jsonPage.put("title", page.getTitle());
       jsonPage.put("app", mPackageName);
       jsonPage.put("vm", page.getVM());
-      jsonPage.put("isLastBundleDownloadSuccess", bundleStatus.isLastDownloadSuccess);
-      jsonPage.put("bundleUpdateTimestamp", bundleStatus.updateTimestamp);
       array.put(jsonPage);
     }
     return array;
@@ -317,22 +311,4 @@ public class InspectorPackagerConnection {
       }
     }
   }
-
-  public static class BundleStatus {
-    public Boolean isLastDownloadSuccess;
-    public long updateTimestamp = -1;
-
-    public BundleStatus(Boolean isLastDownloadSuccess, long updateTimestamp) {
-      this.isLastDownloadSuccess = isLastDownloadSuccess;
-      this.updateTimestamp = updateTimestamp;
-    }
-
-    public BundleStatus() {
-      this(false, -1);
-    }
-  }
-
-  public interface BundleStatusProvider {
-    BundleStatus getBundleStatus();
-  }
 }

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

@@ -26,10 +26,6 @@ public class JSCHeapCapture extends NativeJSCHeapCaptureSpec {
     CaptureException(String message) {
       super(message);
     }
-
-    CaptureException(String message, Throwable cause) {
-      super(message, cause);
-    }
   }
 
   public interface CaptureCallback {

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

@@ -11,10 +11,12 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.view.View;
 import android.view.Window;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.R;
 
 /** Dialog for displaying JS errors in LogBox. */
-public class LogBoxDialog extends Dialog {
+@Nullsafe(Nullsafe.Mode.LOCAL)
+class LogBoxDialog extends Dialog {
   public LogBoxDialog(Activity context, View reactRootView) {
     super(context, R.style.Theme_Catalyst_LogBox);
 

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

@@ -20,7 +20,7 @@ import com.facebook.react.util.RNLog;
  * The implementation of SurfaceDelegate with {@link Activity}. This is the default SurfaceDelegate
  * for Mobile.
  */
-public class LogBoxDialogSurfaceDelegate implements SurfaceDelegate {
+class LogBoxDialogSurfaceDelegate implements SurfaceDelegate {
 
   private @Nullable View mReactRootView;
   private @Nullable LogBoxDialog mDialog;

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

@@ -9,12 +9,14 @@ package com.facebook.react.devsupport;
 
 import androidx.annotation.Nullable;
 import com.facebook.fbreact.specs.NativeLogBoxSpec;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.module.annotations.ReactModule;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 @ReactModule(name = NativeLogBoxSpec.NAME)
 public class LogBoxModule extends NativeLogBoxSpec {
 

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

@@ -15,7 +15,7 @@ import okio.BufferedSource;
 import okio.ByteString;
 
 /** Utility class to parse the body of a response of type multipart/mixed. */
-public class MultipartStreamReader {
+class MultipartStreamReader {
   // Standard line separator for HTTP.
   private static final String CRLF = "\r\n";
 

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

@@ -8,6 +8,7 @@
 package com.facebook.react.devsupport;
 
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import java.io.IOException;
@@ -21,6 +22,7 @@ import okhttp3.Response;
 import okhttp3.ResponseBody;
 
 /** Use this class to check if the JavaScript packager is running on the provided host. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class PackagerStatusCheck {
 
   private static final String PACKAGER_OK_STATUS = "packager-status:running";

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

@@ -8,15 +8,16 @@
 package com.facebook.react.devsupport;
 
 import android.content.Context;
+import com.facebook.infer.annotation.Nullsafe;
 
 /**
  * Interface for accessing and interacting with development features related to performance testing.
  * Communication is enabled via the Inspector, but everything else is disabled.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public final class PerftestDevSupportManager extends DisabledDevSupportManager {
   private final DevServerHelper mDevServerHelper;
   private final DevInternalSettings mDevSettings;
-  private final InspectorPackagerConnection.BundleStatus mBundleStatus;
 
   public PerftestDevSupportManager(Context applicationContext) {
     mDevSettings =
@@ -26,12 +27,10 @@ public final class PerftestDevSupportManager extends DisabledDevSupportManager {
               @Override
               public void onInternalSettingsChanged() {}
             });
-    mBundleStatus = new InspectorPackagerConnection.BundleStatus();
     mDevServerHelper =
         new DevServerHelper(
             mDevSettings,
             applicationContext.getPackageName(),
-            (InspectorPackagerConnection.BundleStatusProvider) () -> mBundleStatus,
             mDevSettings.getPackagerConnectionSettings());
   }
 

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

@@ -23,7 +23,7 @@ import com.facebook.react.devsupport.interfaces.RedBoxHandler;
  * The implementation of SurfaceDelegate with {@link Activity}. This is the default SurfaceDelegate
  * for Mobile.
  */
-public class RedBoxDialogSurfaceDelegate implements SurfaceDelegate {
+class RedBoxDialogSurfaceDelegate implements SurfaceDelegate {
 
   private final DoubleTapReloadRecognizer mDoubleTapReloadRecognizer;
   private final DevSupportManager mDevSupportManager;

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

@@ -14,7 +14,7 @@ import java.util.LinkedList;
 import java.util.Queue;
 
 /** Helper for computing information about the view hierarchy */
-public class ViewHierarchyUtil {
+class ViewHierarchyUtil {
 
   /** Returns the view instance and depth of the deepest leaf view from the given root view. */
   public static Pair<View, Integer> getDeepestLeaf(View root) {

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

@@ -9,22 +9,19 @@ package com.facebook.react.devsupport;
 
 import android.os.Build;
 import android.view.WindowManager;
+import com.facebook.infer.annotation.Nullsafe;
 
 /**
  * Compatibility wrapper for apps targeting API level 26 or later. See
  * https://developer.android.com/about/versions/oreo/android-8.0-changes.html#cwt
  */
-/* package */ class WindowOverlayCompat {
+/* package */ @Nullsafe(Nullsafe.Mode.LOCAL)
+class WindowOverlayCompat {
 
-  private static final int ANDROID_OREO = 26;
   private static final int TYPE_APPLICATION_OVERLAY = 2038;
 
-  static final int TYPE_SYSTEM_ALERT =
-      Build.VERSION.SDK_INT < ANDROID_OREO
-          ? WindowManager.LayoutParams.TYPE_SYSTEM_ALERT
-          : TYPE_APPLICATION_OVERLAY;
   static final int TYPE_SYSTEM_OVERLAY =
-      Build.VERSION.SDK_INT < ANDROID_OREO
+      Build.VERSION.SDK_INT < Build.VERSION_CODES.O
           ? WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY
           : TYPE_APPLICATION_OVERLAY;
 }

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

@@ -7,6 +7,9 @@
 
 package com.facebook.react.devsupport.interfaces;
 
+import com.facebook.infer.annotation.Nullsafe;
+
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public enum ErrorType {
   JS("JS"),
   NATIVE("Native");

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

@@ -17,10 +17,9 @@ import com.facebook.react.fabric.events.EventEmitterWrapper;
 
 public interface Binding {
 
-  public void startSurface(
-      int surfaceId, @NonNull String moduleName, @NonNull NativeMap initialProps);
+  void startSurface(int surfaceId, @NonNull String moduleName, @NonNull NativeMap initialProps);
 
-  public void startSurfaceWithConstraints(
+  void startSurfaceWithConstraints(
       int surfaceId,
       String moduleName,
       NativeMap initialProps,
@@ -33,13 +32,11 @@ public interface Binding {
       boolean isRTL,
       boolean doLeftAndRightSwapInRTL);
 
-  public void renderTemplateToSurface(int surfaceId, String uiTemplate);
+  void stopSurface(int surfaceId);
 
-  public void stopSurface(int surfaceId);
+  void setPixelDensity(float pointScaleFactor);
 
-  public void setPixelDensity(float pointScaleFactor);
-
-  public void setConstraints(
+  void setConstraints(
       int surfaceId,
       float minWidth,
       float maxWidth,
@@ -50,13 +47,13 @@ public interface Binding {
       boolean isRTL,
       boolean doLeftAndRightSwapInRTL);
 
-  public void driveCxxAnimations();
+  void driveCxxAnimations();
 
-  public void reportMount(int surfaceId);
+  void reportMount(int surfaceId);
 
-  public ReadableNativeMap getInspectorDataForInstance(EventEmitterWrapper eventEmitterWrapper);
+  ReadableNativeMap getInspectorDataForInstance(EventEmitterWrapper eventEmitterWrapper);
 
-  public void register(
+  void register(
       @NonNull RuntimeExecutor runtimeExecutor,
       @NonNull RuntimeScheduler runtimeScheduler,
       @NonNull FabricUIManager fabricUIManager,
@@ -64,9 +61,9 @@ public interface Binding {
       @NonNull ComponentFactory componentFactory,
       @NonNull ReactNativeConfig reactNativeConfig);
 
-  public void unregister();
+  void unregister();
 
-  public void registerSurface(SurfaceHandlerBinding surfaceHandler);
+  void registerSurface(SurfaceHandlerBinding surfaceHandler);
 
-  public void unregisterSurface(SurfaceHandlerBinding surfaceHandler);
+  void unregisterSurface(SurfaceHandlerBinding surfaceHandler);
 }

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

@@ -9,6 +9,7 @@ package com.facebook.react.fabric;
 
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
@@ -20,6 +21,7 @@ import com.facebook.react.fabric.events.EventBeatManager;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.uimanager.PixelUtil;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 @DoNotStrip
 @SuppressLint("MissingNativeLoadLibrary")
 public class BindingImpl implements Binding {
@@ -63,9 +65,6 @@ public class BindingImpl implements Binding {
       boolean isRTL,
       boolean doLeftAndRightSwapInRTL);
 
-  @Override
-  public native void renderTemplateToSurface(int surfaceId, String uiTemplate);
-
   @Override
   public native void stopSurface(int surfaceId);
 

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

@@ -8,9 +8,11 @@
 package com.facebook.react.fabric;
 
 import androidx.annotation.NonNull;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 @DoNotStrip
 public class ComponentFactory {
 

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

@@ -7,9 +7,11 @@
 
 package com.facebook.react.fabric;
 
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 
+@Nullsafe(Nullsafe.Mode.LOCAL)
 @DoNotStrip
 public class CoreComponentsRegistry {
   static {