Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fdae05f authored by Philip Milne's avatar Philip Milne Committed by Android Git Automerger
Browse files

am 6b36d0d0: am 3e350304: Merge "Fix for layout parameter validation bug in... 

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

* commit '6b36d0d0':
  Fix for layout parameter validation bug in GridLayout.
parents 6b31eab9 6b36d0d0

core/java/android/widget/GridLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -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;