From 782c04b864dc5f71f7ec0c8e36cbaf5b838dc69c Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Wed, 2 May 2012 15:45:23 -0700
Subject: [PATCH] Revert "Fix for layout parameter validation bug in
 GridLayout."

This reverts commit 8a36e05443f13edde1eae0cf6ea01b3b2da6e637 which was causing
keyguard_screen_tab_unlock.xml to have a bad layout.

Change-Id: I50bdc6dbdf8d7b98ef77eae532860d375574213e
---
 core/java/android/widget/GridLayout.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;