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

Commit 07fd2a9b authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 07a42cfc: am 1771ee34: Merge "Revert "Fix for layout parameter validation... 

am 07a42cfc: am 1771ee34: Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev

* commit '07a42cfc':
  Revert "Fix for layout parameter validation bug in GridLayout."
parents 8015d3fa 07a42cfc

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 = max(0, axis.getCount()); // Handle negative values, including UNDEFINED

        final int count = (axis.definedCount != UNDEFINED) ? axis.definedCount : 0;



        int major = 0;

        int minor = 0;