diff options
| author | Adam Powell <adamp@google.com> | 2013-09-14 00:23:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-14 00:23:07 +0000 |
| commit | 50e5814c337f67c74d9e249cf6f67ac86dfc832d (patch) | |
| tree | a13cfdc0098cca1ab232d821c355474930f72a62 /core/java/android/widget | |
| parent | 76adfd71f1ebdf50a03c85e2a7c87d5691f81b13 (diff) | |
| parent | 758d5a4563a71d4f3f7efbf7e450e8e537abc185 (diff) | |
| download | frameworks_base-50e5814c337f67c74d9e249cf6f67ac86dfc832d.zip frameworks_base-50e5814c337f67c74d9e249cf6f67ac86dfc832d.tar.gz frameworks_base-50e5814c337f67c74d9e249cf6f67ac86dfc832d.tar.bz2 | |
Merge "Check RelativeLayout's access of its own LayoutParams during measurement" into klp-dev
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 92c9b93..e03e83d 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -536,7 +536,7 @@ public class RelativeLayout extends ViewGroup { // the right of each child view width += mPaddingRight; - if (mLayoutParams.width >= 0) { + if (mLayoutParams != null && mLayoutParams.width >= 0) { width = Math.max(width, mLayoutParams.width); } @@ -566,7 +566,7 @@ public class RelativeLayout extends ViewGroup { // the bottom of each child view height += mPaddingBottom; - if (mLayoutParams.height >= 0) { + if (mLayoutParams != null && mLayoutParams.height >= 0) { height = Math.max(height, mLayoutParams.height); } |