From fb9b576bff51835e795d7f4dc9effe615fec9408 Mon Sep 17 00:00:00 2001 From: Manol Donev Date: Tue, 21 May 2019 16:00:46 +0300 Subject: [PATCH] fix(android): CommonLayoutParams measure/layout child guard --- .../java/org/nativescript/widgets/CommonLayoutParams.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java b/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java index 4ada4c16f4..a6f661fabd 100644 --- a/tns-core-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/CommonLayoutParams.java +++ b/tns-core-modules-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; }