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

Commit 1771ee34 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix for layout parameter validation bug in GridLayout."" into jb-dev

parents fbbdbc2d 782c04b8

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;