diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java
index 4d9ff0f56f268..cb10d0a8fc283 100644
--- a/core/java/android/widget/GridLayout.java
+++ b/core/java/android/widget/GridLayout.java
@@ -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;