From cf70dcb0f76d1175f1d3c31da1c827eb443a323a Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Fri, 7 Jan 2011 11:03:20 -0800
Subject: Fix typo bug in FrameLayout's measurement code. Bug #3327185

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

(limited to 'core/java/android/widget/FrameLayout.java')

diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java
index 7bae3608f1c3..2bc63019fcc6 100644
--- a/core/java/android/widget/FrameLayout.java
+++ b/core/java/android/widget/FrameLayout.java
@@ -321,7 +321,7 @@ public class FrameLayout extends ViewGroup {
                             mPaddingTop - mPaddingBottom - lp.topMargin - lp.bottomMargin,
                             MeasureSpec.EXACTLY);
                 } else {
-                    childHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
+                    childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,
                             mPaddingTop + mPaddingBottom + lp.topMargin + lp.bottomMargin,
                             lp.height);
                 }
-- 
cgit v1.2.3