diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java index a63e42e29f8..046d757e2af 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/layoutanimation/LayoutAnimationController.java @@ -88,6 +88,9 @@ public class LayoutAnimationController { // resume when view is re-attached to parent, which is the standard android animation behavior. // If there's a layout handling animation going on, it should be animated nonetheless since the // ongoing animation needs to be updated. + if (viewToAnimate == null) { + return false; + } return (mShouldAnimateLayout && viewToAnimate.getParent() != null) || mLayoutHandlers.get(viewToAnimate.getId()) != null; }