Check if child view != null before dropping. Fixes facebook#20288

flatfox-ag · Jul 31, 2018 · 09daee6 · 09daee6
1 parent 847261b
commit 09daee6
Showing 1 changed file with 1 addition and 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
@@ -570,7 +570,7 @@ protected synchronized void dropView(View view) {
       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 && mTagsToViews.get(child.getId()) != null) {
           dropView(child);
         }
       }