From 526b40bfe3a11233f5e4a325394e209e8de1d3b8 Mon Sep 17 00:00:00 2001 From: Sidharth Guglani Date: Mon, 25 Mar 2019 06:33:12 -0700 Subject: [PATCH] fixed @Nullable missing infer errors Summary: Fixed Nullable lint errors Reviewed By: davidaurelio Differential Revision: D14383930 fbshipit-source-id: 0847e19c50a0b8d4039199045b74aa86c96ac096 --- .../src/main/java/com/facebook/yoga/YogaNode.java | 1 + .../main/java/com/facebook/yoga/YogaNodeJNIBase.java | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java index c01d0cec637..c6db5d4506a 100644 --- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java +++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.java @@ -213,6 +213,7 @@ public abstract class YogaNode { public abstract void setData(Object data); + @Nullable public abstract Object getData(); public abstract void print(); diff --git a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java index 4981ebd19b4..7ddfa228ac0 100644 --- a/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java +++ b/ReactAndroid/src/main/java/com/facebook/yoga/YogaNodeJNIBase.java @@ -14,12 +14,12 @@ import javax.annotation.Nullable; @DoNotStrip public abstract class YogaNodeJNIBase extends YogaNode { - private YogaNodeJNIBase mOwner; + @Nullable private YogaNodeJNIBase mOwner; @Nullable private List mChildren; - private YogaMeasureFunction mMeasureFunction; - private YogaBaselineFunction mBaselineFunction; + @Nullable private YogaMeasureFunction mMeasureFunction; + @Nullable private YogaBaselineFunction mBaselineFunction; private long mNativePointer; - private Object mData; + @Nullable private Object mData; /* Those flags needs be in sync with YGJNI.cpp */ private static final int MARGIN = 1; @@ -623,7 +623,8 @@ public abstract class YogaNodeJNIBase extends YogaNode { mData = data; } - public Object getData() { + @Override + public @Nullable Object getData() { return mData; }