From af181fb192c83e1dd0575c24e38d8814bbf187d6 Mon Sep 17 00:00:00 2001 From: Artur Chrusciel Date: Fri, 28 Sep 2018 15:33:11 -0700 Subject: [PATCH] Check if child view != null before dropping (#20465) Summary: Fixes our top crash when framework try drop a view from parent, but it's a null (already removed etc.). Fixes #20288 Pull Request resolved: https://github.com/facebook/react-native/pull/20465 Differential Revision: D10113976 Pulled By: hramos fbshipit-source-id: 34f5654f3bdbc63eb7f7d0b5c94885576fc3cdcd --- .../facebook/react/uimanager/NativeViewHierarchyManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java index 3e6993518..430f2478a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java @@ -570,7 +570,9 @@ public class NativeViewHierarchyManager { ViewGroupManager viewGroupManager = (ViewGroupManager) viewManager; for (int i = viewGroupManager.getChildCount(viewGroup) - 1; i >= 0; i--) { View child = viewGroupManager.getChildAt(viewGroup, i); - if (mTagsToViews.get(child.getId()) != null) { + if (child == null) { + FLog.e(TAG, "Unable to drop null child view"); + } else if (mTagsToViews.get(child.getId()) != null) { dropView(child); } }