fix(android): CommonLayoutParams measure/layout child guard (#7271)

NativeScript · May 22, 2019 · 333ab36 · 333ab36
1 parent 0aca087
commit 333ab36
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...es-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java b/...es-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java
@@ -99,7 +99,7 @@ protected static int getDesiredHeight(View view) {
     // We use our own layout method because the one in FrameLayout is broken when margins are set and gravity is CENTER_VERTICAL or CENTER_HORIZONTAL.
     @SuppressLint("RtlHardcoded")
     protected static void layoutChild(View child, int left, int top, int right, int bottom) {
-        if (child.getVisibility() == View.GONE) {
+        if (child == null || child.getVisibility() == View.GONE) {
             return;
         }
 
@@ -223,7 +223,7 @@ protected static void layoutChild(View child, int left, int top, int right, int
     }
 
     protected static void measureChild(View child, int widthMeasureSpec, int heightMeasureSpec) {
-        if (child.getVisibility() == View.GONE) {
+        if (child == null || child.getVisibility() == View.GONE) {
             return;
         }