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

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

@@ -26,6 +26,9 @@ import com.facebook.react.bridge.queue.MessageQueueThread;
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
+import com.facebook.react.common.annotations.FrameworkAPI;
+import com.facebook.react.common.annotations.UnstableReactNativeAPI;
 import java.lang.ref.WeakReference;
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -35,6 +38,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * CatalystInstance}
  */
 public class ReactContext extends ContextWrapper {
+
   @DoNotStrip
   public interface RCTDeviceEventEmitter extends JavaScriptModule {
     void emit(@NonNull String eventName, @Nullable Object data);
@@ -205,6 +209,20 @@ public class ReactContext extends ContextWrapper {
     return mCatalystInstance.getNativeModule(nativeModuleInterface);
   }
 
+  /**
+   * @return the RuntimeExecutor, a thread-safe handler for accessing the runtime.
+   * @experimental
+   */
+  @Nullable
+  @FrameworkAPI
+  @UnstableReactNativeAPI
+  public RuntimeExecutor getRuntimeExecutor() {
+    if (mCatalystInstance == null) {
+      raiseCatalystInstanceMissingException();
+    }
+    return mCatalystInstance.getRuntimeExecutor();
+  }
+
   /**
    * Calls RCTDeviceEventEmitter.emit to JavaScript, with given event name and an optional list of
    * arguments.
@@ -546,12 +564,19 @@ public class ReactContext extends ContextWrapper {
     return null;
   }
 
-  public @Nullable JSIModule getJSIModule(JSIModuleType moduleType) {
-    if (!hasActiveReactInstance()) {
-      throw new IllegalStateException(
-          "Unable to retrieve a JSIModule if CatalystInstance is not active.");
-    }
-    return mCatalystInstance.getJSIModule(moduleType);
+  @DeprecatedInNewArchitecture(
+      message =
+          "This method will be deprecated later as part of Stable APIs with bridge removal and not encouraged usage.")
+  /**
+   * Get the UIManager for Fabric from the CatalystInstance.
+   *
+   * @return The UIManager when CatalystInstance is active.
+   */
+  public @Nullable UIManager getFabricUIManager() {
+    UIManager uiManager = mCatalystInstance.getFabricUIManager();
+    return uiManager != null
+        ? uiManager
+        : (UIManager) mCatalystInstance.getJSIModule(JSIModuleType.UIManager);
   }
 
   /**

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

@@ -7,65 +7,24 @@
 
 package com.facebook.react.bridge;
 
-import static com.facebook.infer.annotation.ThreadConfined.ANY;
-
 import android.app.Activity;
 import androidx.annotation.Nullable;
-import com.facebook.common.logging.FLog;
-import com.facebook.infer.annotation.Assertions;
-import com.facebook.infer.annotation.ThreadConfined;
-import com.facebook.react.common.ReactConstants;
-import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture;
 
 /**
  * Base class for Catalyst native modules that require access to the {@link ReactContext} instance.
  */
+@DeprecatedInNewArchitecture(
+    message =
+        "ReactContextBaseJavaModule will be deprecated in new Architecture of React Native, use BaseJavaModule instead")
 public abstract class ReactContextBaseJavaModule extends BaseJavaModule {
 
-  private final @Nullable ReactApplicationContext mReactApplicationContext;
-
   public ReactContextBaseJavaModule() {
-    mReactApplicationContext = null;
+    super(null);
   }
 
   public ReactContextBaseJavaModule(@Nullable ReactApplicationContext reactContext) {
-    mReactApplicationContext = reactContext;
-  }
-
-  /** Subclasses can use this method to access catalyst context passed as a constructor. */
-  protected final ReactApplicationContext getReactApplicationContext() {
-    return Assertions.assertNotNull(
-        mReactApplicationContext,
-        "Tried to get ReactApplicationContext even though NativeModule wasn't instantiated with one");
-  }
-
-  /**
-   * Subclasses can use this method to access catalyst context passed as a constructor. Use this
-   * version to check that the underlying CatalystInstance is active before returning, and
-   * automatically have SoftExceptions or debug information logged for you. Consider using this
-   * whenever calling ReactApplicationContext methods that require the Catalyst instance be alive.
-   *
-   * <p>This can return null at any time, but especially during teardown methods it's
-   * possible/likely.
-   *
-   * <p>Threading implications have not been analyzed fully yet, so assume this method is not
-   * thread-safe.
-   */
-  @ThreadConfined(ANY)
-  protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn() {
-    if (mReactApplicationContext.hasActiveReactInstance()) {
-      return mReactApplicationContext;
-    }
-
-    // We want to collect data about how often this happens, but SoftExceptions will cause a crash
-    // in debug mode, which isn't usually desirable.
-    String msg = "Catalyst Instance has already disappeared: requested by " + this.getName();
-    if (ReactBuildConfig.DEBUG) {
-      FLog.w(ReactConstants.TAG, msg);
-    } else {
-      ReactSoftExceptionLogger.logSoftException(ReactConstants.TAG, new RuntimeException(msg));
-    }
-    return null;
+    super(reactContext);
   }
 
   /**
@@ -78,7 +37,9 @@ public abstract class ReactContextBaseJavaModule extends BaseJavaModule {
    * call this method whenever you actually need the Activity and make sure to check for {@code
    * null}.
    */
+  @DeprecatedInNewArchitecture(
+      message = "Use 'getReactApplicationContext.getCurrentActivity() instead.")
   protected @Nullable final Activity getCurrentActivity() {
-    return mReactApplicationContext.getCurrentActivity();
+    return getReactApplicationContext().getCurrentActivity();
   }
 }

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

@@ -46,8 +46,6 @@ public enum ReactMarkerConstants {
   CREATE_I18N_MODULE_CONSTANTS_END,
   I18N_MODULE_CONSTANTS_CONVERT_START,
   I18N_MODULE_CONSTANTS_CONVERT_END,
-  CREATE_I18N_ASSETS_MODULE_START,
-  CREATE_I18N_ASSETS_MODULE_END,
   GET_CONSTANTS_START,
   GET_CONSTANTS_END,
   INITIALIZE_MODULE_START,

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

@@ -15,14 +15,13 @@ import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import com.facebook.infer.annotation.ThreadConfined;
 
-public interface UIManager extends JSIModule, PerformanceCounter {
+public interface UIManager extends PerformanceCounter {
 
   /** Registers a new root view. @Deprecated call startSurface instead */
   @UiThread
   @ThreadConfined(UI)
   @Deprecated
-  <T extends View> int addRootView(
-      final T rootView, WritableMap initialProps, @Nullable String initialUITemplate);
+  <T extends View> int addRootView(final T rootView, WritableMap initialProps);
 
   /** Registers a new root view with width and height. */
   @AnyThread
@@ -152,4 +151,10 @@ public interface UIManager extends JSIModule, PerformanceCounter {
   @Deprecated
   @Nullable
   String resolveCustomDirectEventName(@Nullable String eventName);
+
+  /** This method is called after {@link ReactApplicationContext} has been created. */
+  void initialize();
+
+  /** Called before React Native instance is destroyed. */
+  void invalidate();
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/{UIManagerListener.java → UIManagerListener.kt}

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.bridge;
+package com.facebook.react.bridge
 
 /** Listener used to hook into the UIManager update process. */
 public interface UIManagerListener {
@@ -15,30 +15,30 @@ public interface UIManagerListener {
    *
    * <p>This is called by Paper only.
    */
-  void willDispatchViewUpdates(UIManager uiManager);
+  public fun willDispatchViewUpdates(uiManager: UIManager): Unit
   /**
    * Called on UIThread right before view updates are executed.
    *
    * <p>This is called by Fabric only.
    */
-  void willMountItems(UIManager uiManager);
+  public fun willMountItems(uiManager: UIManager): Unit
   /**
    * Called on UIThread right after view updates are executed.
    *
    * <p>This is called by Fabric only.
    */
-  void didMountItems(UIManager uiManager);
+  public fun didMountItems(uiManager: UIManager): Unit
   /**
    * Called on UIThread right after view updates are dispatched for a frame. Note that this will be
    * called for every frame even if there are no updates.
    *
    * <p>This is called by Fabric only.
    */
-  void didDispatchMountItems(UIManager uiManager);
+  public fun didDispatchMountItems(uiManager: UIManager): Unit
   /**
    * Called right after scheduleMountItems is called in Fabric, after a new tree is committed.
    *
    * <p>This is called by Fabric only.
    */
-  void didScheduleMountItems(UIManager uiManager);
+  public fun didScheduleMountItems(uiManager: UIManager): Unit
 }

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

@@ -0,0 +1,22 @@
+/*
+ * 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.bridge
+
+import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
+
+/**
+ * {@link UIManagerProvider} is used to create UIManager objects during the initialization of React
+ * Native. This was introduced as a temporary interface to enable the new renderer of React Native
+ * in isolation of others part of the new architecture of React Native.
+ */
+@DeprecatedInNewArchitecture
+public fun interface UIManagerProvider {
+
+  /* Provides a {@link com.facebook.react.bridge.UIManager} for the context received as a parameter. */
+  public fun createUIManager(context: ReactApplicationContext): UIManager?
+}

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

@@ -15,7 +15,19 @@ import com.facebook.react.common.build.ReactBuildConfig;
 /** Utility for interacting with the UI thread. */
 public class UiThreadUtil {
 
-  @Nullable private static Handler sMainHandler;
+  private static volatile @Nullable Handler sMainHandler;
+
+  public static Handler getUiThreadHandler() {
+    // Double null-check to avoid unnecessary lock
+    if (sMainHandler == null) {
+      synchronized (UiThreadUtil.class) {
+        if (sMainHandler == null) {
+          sMainHandler = new Handler(Looper.getMainLooper());
+        }
+      }
+    }
+    return sMainHandler;
+  }
 
   /** @return {@code true} if the current thread is the UI thread. */
   public static boolean isOnUiThread() {
@@ -45,17 +57,17 @@ public class UiThreadUtil {
   }
 
   /** Runs the given {@code Runnable} on the UI thread. */
-  public static void runOnUiThread(Runnable runnable) {
-    runOnUiThread(runnable, 0);
+  public static boolean runOnUiThread(Runnable runnable) {
+    return getUiThreadHandler().postDelayed(runnable, 0);
   }
 
   /** Runs the given {@code Runnable} on the UI thread with the specified delay. */
-  public static void runOnUiThread(Runnable runnable, long delayInMs) {
-    synchronized (UiThreadUtil.class) {
-      if (sMainHandler == null) {
-        sMainHandler = new Handler(Looper.getMainLooper());
-      }
-    }
-    sMainHandler.postDelayed(runnable, delayInMs);
+  public static boolean runOnUiThread(Runnable runnable, long delayInMs) {
+    return getUiThreadHandler().postDelayed(runnable, delayInMs);
+  }
+
+  /** Removes the given {@code Runnable} on the UI thread. */
+  public static void removeOnUiThread(Runnable runnable) {
+    getUiThreadHandler().removeCallbacks(runnable);
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/interop/InteropModuleRegistry.java

@@ -26,7 +26,7 @@ public class InteropModuleRegistry {
   private final HashMap<Class, Object> supportedModules;
 
   public InteropModuleRegistry() {
-    this.supportedModules = new HashMap<>();
+    supportedModules = new HashMap<>();
   }
 
   public <T extends JavaScriptModule> boolean shouldReturnInteropModule(Class<T> requestedModule) {

package/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadHandler.java

@@ -10,8 +10,6 @@ package com.facebook.react.bridge.queue;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import com.facebook.common.logging.FLog;
-import com.facebook.react.common.ReactConstants;
 
 /** Handler that can catch and dispatch Exceptions to an Exception handler. */
 public class MessageQueueThreadHandler extends Handler {
@@ -28,15 +26,6 @@ public class MessageQueueThreadHandler extends Handler {
     try {
       super.dispatchMessage(msg);
     } catch (Exception e) {
-      if (e instanceof NullPointerException) {
-        FLog.e(
-            ReactConstants.TAG,
-            "Caught NullPointerException when dispatching message in MessageQueueThreadHandler. This is likely caused by runnable"
-                + "(msg.callback) being nulled in Android Handler after dispatching and before handling (see T170239922 for more details)."
-                + "Currently we observe that it only happen once which is during initialisation. Due to fixing probably involve Android "
-                + "System code, we decide to ignore here for now and print an error message for debugging purpose in case this cause more serious issues in future.");
-        return;
-      }
       mExceptionHandler.handleException(e);
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java

@@ -190,9 +190,8 @@ public class MessageQueueThreadImpl implements MessageQueueThread {
   /** @return a MessageQueueThreadImpl corresponding to Android's main UI thread. */
   private static MessageQueueThreadImpl createForMainThread(
       String name, QueueThreadExceptionHandler exceptionHandler) {
-    Looper mainLooper = Looper.getMainLooper();
     final MessageQueueThreadImpl mqt =
-        new MessageQueueThreadImpl(name, mainLooper, exceptionHandler);
+        new MessageQueueThreadImpl(name, Looper.getMainLooper(), exceptionHandler);
 
     if (UiThreadUtil.isOnUiThread()) {
       Process.setThreadPriority(Process.THREAD_PRIORITY_DISPLAY);

package/ReactAndroid/src/main/java/com/facebook/react/common/DebugServerException.java

@@ -12,6 +12,7 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -19,6 +20,7 @@ import org.json.JSONObject;
  * Tracks errors connecting to or received from the debug server. The debug server returns errors as
  * json objects. This exception represents that error.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class DebugServerException extends RuntimeException {
   private static final String GENERIC_ERROR_MESSAGE =
       "\n\nTry the following to fix the issue:\n"

package/ReactAndroid/src/main/java/com/facebook/react/common/JavascriptException.java

@@ -7,6 +7,7 @@
 
 package com.facebook.react.common;
 
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.proguard.annotations.DoNotStrip;
 import javax.annotation.Nullable;
 
@@ -14,6 +15,7 @@ import javax.annotation.Nullable;
  * A JS exception that was propagated to native. In debug mode, these exceptions are normally shown
  * to developers in a redbox.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 @DoNotStrip
 public class JavascriptException extends RuntimeException
     implements HasJavascriptExceptionMetadata {
@@ -25,7 +27,7 @@ public class JavascriptException extends RuntimeException
   }
 
   public @Nullable String getExtraDataAsJson() {
-    return this.extraDataAsJson;
+    return extraDataAsJson;
   }
 
   public JavascriptException setExtraDataAsJson(@Nullable String extraDataAsJson) {

package/ReactAndroid/src/main/java/com/facebook/react/common/LifecycleState.java

@@ -7,6 +7,8 @@
 
 package com.facebook.react.common;
 
+import com.facebook.infer.annotation.Nullsafe;
+
 /**
  * Lifecycle state for an Activity. The state right after pause and right before resume are the
  * basically the same so this enum is in terms of the forward lifecycle progression (onResume, etc).
@@ -21,6 +23,7 @@ package com.facebook.react.common;
  * <p>RESUMED is used when a ReactRootView is rendered on the screen and the user can interact with
  * it.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public enum LifecycleState {
   BEFORE_CREATE,
   BEFORE_RESUME,

package/ReactAndroid/src/main/java/com/facebook/react/common/LongArray.java

@@ -7,7 +7,10 @@
 
 package com.facebook.react.common;
 
+import com.facebook.infer.annotation.Nullsafe;
+
 /** Object wrapping an auto-expanding long[]. Like an ArrayList<Long> but without the autoboxing. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class LongArray {
 
   private static final double INNER_ARRAY_GROWTH_FACTOR = 1.8;

package/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java

@@ -7,10 +7,12 @@
 
 package com.facebook.react.common;
 
+import com.facebook.infer.annotation.Nullsafe;
 import java.util.HashMap;
 import java.util.Map;
 
 /** Utility class for creating maps */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class MapBuilder {
 
   /** Creates an instance of {@code HashMap} */

package/ReactAndroid/src/main/java/com/facebook/react/common/ReactConstants.java

@@ -7,7 +7,18 @@
 
 package com.facebook.react.common;
 
+import com.facebook.infer.annotation.Nullsafe;
+
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ReactConstants {
 
   public static final String TAG = "ReactNative";
+
+  /**
+   * Some types have built-in support for representing a "missing" or "unset" value, for example NaN
+   * in the case of floating point numbers or null in the case of object references. Integers don't
+   * have such a special value. When an integer represent an inherently non-negative value, we use a
+   * special negative value to mark it as "unset".
+   */
+  public static final int UNSET = -1;
 }

package/ReactAndroid/src/main/java/com/facebook/react/common/ShakeDetector.java

@@ -13,9 +13,11 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import java.util.concurrent.TimeUnit;
 
 /** Listens for the user shaking their phone. Allocation-less once it starts listening. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ShakeDetector implements SensorEventListener {
   // Collect sensor data in this interval (nanoseconds)
   private static final long MIN_TIME_BETWEEN_SAMPLES_NS =

package/ReactAndroid/src/main/java/com/facebook/react/common/SingleThreadAsserter.java

@@ -9,8 +9,10 @@ package com.facebook.react.common;
 
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 
 /** Simple class for asserting that operations only run on a single thread. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class SingleThreadAsserter {
   private @Nullable Thread mThread = null;
 

package/ReactAndroid/src/main/java/com/facebook/react/common/StandardCharsets.java

@@ -7,12 +7,14 @@
 
 package com.facebook.react.common;
 
+import com.facebook.infer.annotation.Nullsafe;
 import java.nio.charset.Charset;
 
 /**
  * Not all versions of Android SDK have this class in nio package. This is the reason to have it
  * around.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 @Deprecated(
     since = "Deprecated class since v0.73.0, please use java.nio.charset.StandardCharsets instead.",
     forRemoval = true)

package/ReactAndroid/src/main/java/com/facebook/react/common/SystemClock.java

@@ -7,10 +7,13 @@
 
 package com.facebook.react.common;
 
+import com.facebook.infer.annotation.Nullsafe;
+
 /**
  * Detour for System.currentTimeMillis and System.nanoTime calls so that they can be mocked out in
  * tests.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class SystemClock {
 
   public static long currentTimeMillis() {

package/ReactAndroid/src/main/java/com/facebook/react/common/annotations/DeprecatedInNewArchitecture.kt

@@ -13,4 +13,4 @@ package com.facebook.react.common.annotations
  */
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-annotation class DeprecatedInNewArchitecture()
+public annotation class DeprecatedInNewArchitecture(val message: String = "")

package/ReactAndroid/src/main/java/com/facebook/react/common/annotations/FrameworkAPI.kt

@@ -15,4 +15,4 @@ package com.facebook.react.common.annotations
         "This API is provided only for React Native frameworks and not intended for general users. " +
             "This API can change between minor versions in alignment with React Native frameworks " +
             "and won't be considered a breaking change.")
-annotation class FrameworkAPI
+public annotation class FrameworkAPI

package/ReactAndroid/src/main/java/com/facebook/react/common/annotations/StableReactNativeAPI.kt

@@ -0,0 +1,13 @@
+/*
+ * 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.common.annotations
+
+/** This API is stable and is likely not to change in the New Architecture of React Native. */
+@Retention(AnnotationRetention.SOURCE)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY)
+public annotation class StableReactNativeAPI

package/ReactAndroid/src/main/java/com/facebook/react/common/annotations/UnstableReactNativeAPI.kt

@@ -12,4 +12,4 @@ package com.facebook.react.common.annotations
 @RequiresOptIn(
     level = RequiresOptIn.Level.ERROR,
     message = "This API is experimental and is likely to change or to be removed in the future")
-annotation class UnstableReactNativeAPI
+public annotation class UnstableReactNativeAPI

package/ReactAndroid/src/main/java/com/facebook/react/common/annotations/VisibleForTesting.kt

@@ -11,4 +11,4 @@ package com.facebook.react.common.annotations
  * Annotates a method that should have restricted visibility but it's required to be public for use
  * in test code only.
  */
-annotation class VisibleForTesting
+public annotation class VisibleForTesting

package/ReactAndroid/src/main/java/com/facebook/react/common/assets/ReactFontManager.java

@@ -15,6 +15,7 @@ import android.util.SparseArray;
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
 import com.facebook.infer.annotation.Nullsafe;
+import com.facebook.react.common.ReactConstants;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -167,8 +168,6 @@ public class ReactFontManager {
 
     public static final int BOLD = 700;
     public static final int NORMAL = 400;
-    public static final int UNSET = -1;
-
     private static final int MIN_WEIGHT = 1;
     private static final int MAX_WEIGHT = 1000;
 
@@ -177,11 +176,11 @@ public class ReactFontManager {
 
     public TypefaceStyle(int weight, boolean italic) {
       mItalic = italic;
-      mWeight = weight == UNSET ? NORMAL : weight;
+      mWeight = weight == ReactConstants.UNSET ? NORMAL : weight;
     }
 
     public TypefaceStyle(int style) {
-      if (style == UNSET) {
+      if (style == ReactConstants.UNSET) {
         style = Typeface.NORMAL;
       }
 
@@ -194,12 +193,13 @@ public class ReactFontManager {
      * existing weight bit in `style` will be used.
      */
     public TypefaceStyle(int style, int weight) {
-      if (style == UNSET) {
+      if (style == ReactConstants.UNSET) {
         style = Typeface.NORMAL;
       }
 
       mItalic = (style & Typeface.ITALIC) != 0;
-      mWeight = weight == UNSET ? (style & Typeface.BOLD) != 0 ? BOLD : NORMAL : weight;
+      mWeight =
+          weight == ReactConstants.UNSET ? (style & Typeface.BOLD) != 0 ? BOLD : NORMAL : weight;
     }
 
     public int getNearestStyle() {

package/ReactAndroid/src/main/java/com/facebook/react/common/futures/SimpleSettableFuture.java

@@ -8,6 +8,7 @@
 package com.facebook.react.common.futures;
 
 import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -18,6 +19,7 @@ import java.util.concurrent.TimeoutException;
  * A super simple Future-like class that can safely notify another Thread when a value is ready.
  * Does not support canceling.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class SimpleSettableFuture<T> implements Future<T> {
   private final CountDownLatch mReadyLatch = new CountDownLatch(1);
   private @Nullable T mResult;