From eff28ae113f6e5f7264faf22e2b2aa3511c2e21e Mon Sep 17 00:00:00 2001
From: David Vacca <dvacca@meta.com>
Date: Wed, 28 Feb 2024 08:47:35 -0800
Subject: [PATCH] Mark classes of package uimanager as @Nullsafe

Summary:
All these classes are NullSafe, let's mark them as NullSafe(Local) to ensure lint detect errors in the future

bypass-github-export-checks

changelog: [internal] internal

Reviewed By: javache

Differential Revision: D54027184

fbshipit-source-id: 722a7e398849f5d935894f321aa0177167eebaef
---
 .../main/java/com/facebook/react/uimanager/ViewDefaults.java   | 3 +++
 .../facebook/react/uimanager/ViewGroupDrawingOrderHelper.java  | 2 ++
 .../java/com/facebook/react/uimanager/ViewGroupManager.java    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
index 8cab4071bda..772011fb5c6 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewDefaults.java
@@ -7,7 +7,10 @@
 
 package com.facebook.react.uimanager;
 
+import com.facebook.infer.annotation.Nullsafe;
+
 /** Default property values for Views to be shared between Views and ShadowViews. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ViewDefaults {
 
   public static final float FONT_SIZE_SP = 14.0f;
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
index 2bd1d754f3a..99356c260c3 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupDrawingOrderHelper.java
@@ -11,12 +11,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.common.ReactConstants;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
 /** Helper to handle implementing ViewGroups with custom drawing order based on z-index. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class ViewGroupDrawingOrderHelper {
   private final ViewGroup mViewGroup;
   private int mNumberOfChildrenWithZIndex = 0;
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
index 419747ae9b9..52907b218c6 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewGroupManager.java
@@ -10,11 +10,13 @@ package com.facebook.react.uimanager;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.UiThreadUtil;
 import java.util.List;
 import java.util.WeakHashMap;
 
 /** Class providing children management API for view managers of classes extending ViewGroup. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public abstract class ViewGroupManager<T extends ViewGroup>
     extends BaseViewManager<T, LayoutShadowNode> implements IViewGroupManager<T> {