From ecccd066620a00e6172ec09eb3b5b771dc979c5f Mon Sep 17 00:00:00 2001 From: "Andrew Y. Chen" Date: Fri, 23 Jun 2017 10:19:06 -0700 Subject: [PATCH] API check for removeOnGlobalLayoutListener in ReactRootView Reviewed By: AaaChiuuu Differential Revision: D5308604 fbshipit-source-id: adf4abbdd59e54c18fcae946f2f7e3af89e7190c --- .../src/main/java/com/facebook/react/ReactRootView.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java index 489b2394d..89a4fe55d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -13,6 +13,7 @@ import javax.annotation.Nullable; import android.content.Context; import android.graphics.Rect; +import android.os.Build; import android.os.Bundle; import android.util.AttributeSet; import android.view.MotionEvent; @@ -180,7 +181,11 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView protected void onDetachedFromWindow() { super.onDetachedFromWindow(); if (mIsAttachedToInstance) { - getViewTreeObserver().removeOnGlobalLayoutListener(getCustomGlobalLayoutListener()); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + getViewTreeObserver().removeOnGlobalLayoutListener(getCustomGlobalLayoutListener()); + } else { + getViewTreeObserver().removeGlobalOnLayoutListener(getCustomGlobalLayoutListener()); + } } }