Merge "Check RelativeLayout's access of its own LayoutParams during measurement" into klp-dev (50e5814c) · Commits · e / os / android_frameworks_base

core/java/android/widget/RelativeLayout.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}