Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b1825feac000e8d7999b0b956f104e989ea34d05':
  Throw IAE on invalid measure spec size
This commit is contained in:
Alan Viverette
2015-06-23 23:47:34 +00:00
committed by Android Git Automerger
parent 1e7b818d86 b1825feac0
commit 0ca0251263
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/View.java
View File

@@ -21041,6 +21041,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
if (sUseBrokenMakeMeasureSpec) { if (sUseBrokenMakeMeasureSpec) {
return size + mode; return size + mode;
} else { } else {
if (size < 0) {
throw new IllegalArgumentException("Measure spec size must be >= 0");
}
return (size & ~MODE_MASK) | (mode & MODE_MASK); return (size & ~MODE_MASK) | (mode & MODE_MASK);
} }
} }