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

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

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

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

* commit '50e5814c':
  Check RelativeLayout's access of its own LayoutParams during measurement
parents 5b7359aa 50e5814c

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);

            }