From ac6cfb32fec5e4b9ce47c4cde4bbcc7b43a0c4a7 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 23 Jun 2015 16:23:49 -0700
Subject: [PATCH] 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 | 3 +++
 1 file changed, 3 insertions(+)

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