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

am 3e350304: Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev

Browse Source 
* commit '3e350304599eeb627065de75f3bfe3a45f58389e':
  Fix for layout parameter validation bug in GridLayout.
This commit is contained in:
Philip Milne
2012-05-01 16:24:46 -07:00
committed by Android Git Automerger
parent 6b578dc30c 3e35030459
commit 6b36d0d044
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/GridLayout.java
View File

@@ -658,7 +658,7 @@ public class GridLayout extends ViewGroup {
private void validateLayoutParams() {
final boolean horizontal = (orientation == HORIZONTAL);
final Axis axis = horizontal ? horizontalAxis : verticalAxis;
final int count = (axis.definedCount != UNDEFINED) ? axis.definedCount : 0;
final int count = max(0, axis.getCount()); // Handle negative values, including UNDEFINED
int major = 0;
int minor = 0;