diff options
| author | Alan Viverette <alanv@google.com> | 2015-06-23 23:41:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 23:41:03 +0000 |
| commit | b1825feac000e8d7999b0b956f104e989ea34d05 (patch) | |
| tree | 24e59b973cdae4b6c02692d75b093e6c1e40e49e /core/java/android/view | |
| parent | fcaed60650ed8e44a416e7ba05c281aae643b0c6 (diff) | |
| parent | ac6cfb32fec5e4b9ce47c4cde4bbcc7b43a0c4a7 (diff) | |
| download | frameworks_base-b1825feac000e8d7999b0b956f104e989ea34d05.zip frameworks_base-b1825feac000e8d7999b0b956f104e989ea34d05.tar.gz frameworks_base-b1825feac000e8d7999b0b956f104e989ea34d05.tar.bz2 | |
Merge "Throw IAE on invalid measure spec size" into mnc-dev
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/View.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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); } } |