diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt index c6f9446ada5b..2c664ba97b9f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt @@ -30,7 +30,7 @@ private constructor( cxxReactPackages: List, ) : ReactPackageTurboModuleManagerDelegate(context, packages, initHybrid(cxxReactPackages)) { - override fun initHybrid(): HybridData? { + override fun initHybrid(): HybridData { throw UnsupportedOperationException( "DefaultTurboModuleManagerDelegate.initHybrid() must never be called!") } @@ -72,6 +72,6 @@ private constructor( @DoNotStrip @JvmStatic - external fun initHybrid(cxxReactPackages: List): HybridData? + external fun initHybrid(cxxReactPackages: List): HybridData } } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/AndroidChoreographerProvider.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/AndroidChoreographerProvider.java index a3b3de670d9d..745be44af60b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/AndroidChoreographerProvider.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/AndroidChoreographerProvider.java @@ -7,9 +7,11 @@ package com.facebook.react.internal; +import com.facebook.infer.annotation.Nullsafe; import com.facebook.react.bridge.UiThreadUtil; /** An implementation of ChoreographerProvider that directly uses android.view.Choreographer. */ +@Nullsafe(Nullsafe.Mode.LOCAL) public final class AndroidChoreographerProvider implements ChoreographerProvider { public static final class AndroidChoreographer implements ChoreographerProvider.Choreographer { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManagerDelegate.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManagerDelegate.java index c80bd0e6e10a..9fe0fdb630d3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManagerDelegate.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManagerDelegate.java @@ -8,6 +8,7 @@ package com.facebook.react.internal.turbomodule.core; import androidx.annotation.Nullable; +import com.facebook.infer.annotation.Nullsafe; import com.facebook.jni.HybridData; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.bridge.NativeModule; @@ -15,6 +16,7 @@ import java.util.ArrayList; import java.util.List; +@Nullsafe(Nullsafe.Mode.LOCAL) public abstract class TurboModuleManagerDelegate { @DoNotStrip @SuppressWarnings("unused") diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModulePerfLogger.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModulePerfLogger.java index e1c512cc3eac..9a9f198ba624 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModulePerfLogger.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModulePerfLogger.java @@ -7,10 +7,12 @@ package com.facebook.react.internal.turbomodule.core; +import com.facebook.infer.annotation.Nullsafe; import com.facebook.proguard.annotations.DoNotStrip; import com.facebook.react.perflogger.NativeModulePerfLogger; import javax.annotation.Nullable; +@Nullsafe(Nullsafe.Mode.LOCAL) @DoNotStrip class TurboModulePerfLogger {