commit ac6cfb32fec5e4b9ce47c4cde4bbcc7b43a0c4a7
author Alan Viverette <alanv@google.com> Tue Jun 23 16:23:49 2015 -0700
committer Alan Viverette <alanv@google.com> Tue Jun 23 16:23:49 2015 -0700
tree ffbe102c1b3def0225495771dad2374c9ba8cb3a
parent c60408264c7fe19d2f1f3550556f7e6bc1ca716d

Throw IAE on invalid measure spec size

Crash immediately so that we can track down the cause. If we let it
through, we'll hit an ISE later in dispatchVsync() and never know why.

Bug: 21948478
Change-Id: I84edf93cdf09d755419e18a7606b7b6cbd059956

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 92dae2e..502a6bc 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -21041,6 +21041,9 @@
             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);
             }
         }