summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorDave Langemak <dlangemak@google.com>2015-06-25 01:17:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-25 01:18:00 +0000
commitecff75a158db0514dc019eb3ec9b3f04c1a8f420 (patch)
treeafec7d8ec82f7a183b39b0fd44ca96cd558ca044 /core/java/android/view
parent3704da0d9e45605e0ff38408a30de38b672ff83e (diff)
parentafaed06cda3473c3e182a48cf1a1a78c8a005055 (diff)
downloadframeworks_base-ecff75a158db0514dc019eb3ec9b3f04c1a8f420.zip
frameworks_base-ecff75a158db0514dc019eb3ec9b3f04c1a8f420.tar.gz
frameworks_base-ecff75a158db0514dc019eb3ec9b3f04c1a8f420.tar.bz2
Merge "Revert "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.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 502a6bc..92dae2e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -21041,9 +21041,6 @@ 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);
}
}