From a13e1c4e2ca4d9a176d104a34e7da46f89dbde83 Mon Sep 17 00:00:00 2001
From: Konstantin Raev <bestander@fb.com>
Date: Wed, 7 Sep 2016 03:00:00 -0700
Subject: [PATCH] Reverted commit D3811226

Reviewed By: astreet

Differential Revision: D3811226

fbshipit-source-id: 8ade5ef6c34e117fb10a000034b9900f8a56087d
---
 .../java/com/facebook/react/ReactRootView.java     | 14 +++++++++++++-
 1 file changed, 13 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 60073966c85..0e03a260673 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -80,7 +80,19 @@ public class ReactRootView extends SizeMonitoringFrameLayout implements RootView
 
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+    int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+
+    if (widthMode == MeasureSpec.UNSPECIFIED || heightMode == MeasureSpec.UNSPECIFIED) {
+      throw new IllegalStateException(
+          "The root catalyst view must have a width and height given to it by it's parent view. " +
+          "You can do this by specifying MATCH_PARENT or explicit width and height in the " +
+          "layout. widthMode=" + widthMode + ", heightMode=" + heightMode);
+    }
+
+    setMeasuredDimension(
+        MeasureSpec.getSize(widthMeasureSpec),
+        MeasureSpec.getSize(heightMeasureSpec));
 
     mWasMeasured = true;
     // Check if we were waiting for onMeasure to attach the root view