Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3934b9f5 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am db34f3d1: am 50e5814c: Merge "Check RelativeLayout\'s access of its own... 

am db34f3d1: am 50e5814c: Merge "Check RelativeLayout\'s access of its own LayoutParams during measurement" into klp-dev

* commit 'db34f3d1':
  Check RelativeLayout's access of its own LayoutParams during measurement
parents e0549866 db34f3d1

core/java/android/widget/RelativeLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -542,7 +542,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);

            }
@@ -572,7 +572,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);

            }