diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java index 36f8f5e0128..5885f67d077 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerRegistry.java @@ -10,6 +10,7 @@ package com.facebook.react.uimanager; import android.content.ComponentCallbacks2; import android.content.res.Configuration; import androidx.annotation.Nullable; +import com.facebook.infer.annotation.Nullsafe; import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.common.MapBuilder; import java.util.ArrayList; @@ -20,6 +21,7 @@ import java.util.Map; * Class that stores the mapping between native view name used in JS and the corresponding instance * of {@link ViewManager}. */ +@Nullsafe(Nullsafe.Mode.LOCAL) public final class ViewManagerRegistry implements ComponentCallbacks2 { private final Map mViewManagers; @@ -86,9 +88,10 @@ public final class ViewManagerRegistry implements ComponentCallbacks2 { } private @Nullable ViewManager getViewManagerFromResolver(String className) { - @Nullable ViewManager viewManager; - // NULLSAFE_FIXME[Nullable Dereference] - viewManager = mViewManagerResolver.getViewManager(className); + @Nullable ViewManager viewManager = null; + if (mViewManagerResolver != null) { + viewManager = mViewManagerResolver.getViewManager(className); + } if (viewManager != null) { mViewManagers.put(className, viewManager); }