Merge "Don't crash when copying a null Rect Bug #7158068" into jb-mr1-dev (5fe7fbf8) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Rect.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -69,11 +69,15 @@ public final class Rect implements Parcelable {
		* rectangle.
		*/
		public Rect(Rect r) {
		if (r == null) {
		left = top = right = bottom = 0;
		} else {
		left = r.left;
		top = r.top;
		right = r.right;
		bottom = r.bottom;
		}
		}

		@Override
		public boolean equals(Object o) {

+16 −8

Original line number	Diff line number	Diff line
		@@ -66,18 +66,26 @@ public class RectF implements Parcelable {
		* rectangle.
		*/
		public RectF(RectF r) {
		if (r == null) {
		left = top = right = bottom = 0.0f;
		} else {
		left = r.left;
		top = r.top;
		right = r.right;
		bottom = r.bottom;
		}
		}

		public RectF(Rect r) {
		if (r == null) {
		left = top = right = bottom = 0.0f;
		} else {
		left = r.left;
		top = r.top;
		right = r.right;
		bottom = r.bottom;
		}
		}

		@Override
		public boolean equals(Object o) {