From bb9ed2d24c63b56aedb254c3758b3fb0560339b7 Mon Sep 17 00:00:00 2001 From: Olivier Notteghem Date: Wed, 8 Jun 2016 08:11:56 -0700 Subject: [PATCH] Fix potential NPE is layout animation deletion code Reviewed By: dmmiller Differential Revision: D3403930 fbshipit-source-id: 20067542d06396997719bbe963ce87403fae5ac3 --- .../facebook/react/uimanager/NativeViewHierarchyManager.java | 5 ++++- 1 file changed, 4 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 7ffe3596722..00b00d89c8e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java @@ -412,7 +412,10 @@ public class NativeViewHierarchyManager { } } - private boolean arrayContains(int[] array, int ele) { + private boolean arrayContains(@Nullable int[] array, int ele) { + if (array == null) { + return false; + } for (int curEle : array) { if (curEle == ele) { return true;