diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 92dae2efcd718..502a6bc3cff57 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -21041,6 +21041,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             if (sUseBrokenMakeMeasureSpec) {
                 return size + mode;
             } else {
+                if (size < 0) {
+                    throw new IllegalArgumentException("Measure spec size must be >= 0");
+                }
                 return (size & ~MODE_MASK) | (mode & MODE_MASK);
             }
         }