commit 2ad250c4059e28cc4ba5441ff526020dff77c9d9
author Alan Viverette <alanv@google.com> Wed Jun 24 00:12:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 00:12:58 2015 +0000
tree a4fd6da6b1dec7a121223e1a0c7153b9790b34e6
parent f81d956aa60a44c76854f2798633849c8686962c
parent 33ec793e6aceadb5f5a5f507b84b9c8568dbc2a4

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

* commit '33ec793e6aceadb5f5a5f507b84b9c8568dbc2a4':
  Throw IAE on invalid measure spec size

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