am 0ca02512: am b1825fea: Merge "Throw IAE on invalid measure spec size" into mnc-dev

* commit '0ca0251263c6692de59445f3b2e0811fbcb7d7f9':
  Throw IAE on invalid measure spec size

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);
             }
         }