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

Commit 33ec793e authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 0ca02512: am b1825fea: Merge "Throw IAE on invalid measure spec size" into mnc-dev 

* commit '0ca02512':
  Throw IAE on invalid measure spec size
parents 16649d96 0ca02512

core/java/android/view/View.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -21041,6 +21041,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            if (sUseBrokenMakeMeasureSpec) {

            if (sUseBrokenMakeMeasureSpec) {

                return size + mode;

                return size + mode;

            } else {

            } else {

                if (size < 0) {

                    throw new IllegalArgumentException("Measure spec size must be >= 0");

                }

                return (size & ~MODE_MASK) | (mode & MODE_MASK);

                return (size & ~MODE_MASK) | (mode & MODE_MASK);

            }

            }

        }

        }