Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am: 9be1d08acb am: 0a9b7b4fca (2cd2d8a1) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Outline.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -273,8 +273,12 @@ public final class Outline {
	}		}

	/**		/**
	* Sets the Constructs an Outline from a		* Sets the Outline to a
	* {@link android.graphics.Path#isConvex() convex path}.		* {@link android.graphics.Path#isConvex() convex path}.
			*
			* @param convexPath used to construct the Outline. As of
			* {@link android.os.Build.VERSION_CODES#Q}, it is no longer required to be
			* convex.
	*/		*/
	public void setConvexPath(@NonNull Path convexPath) {		public void setConvexPath(@NonNull Path convexPath) {
	if (convexPath.isEmpty()) {		if (convexPath.isEmpty()) {
	@@ -282,10 +286,6 @@ public final class Outline {
	return;		return;
	}		}

	if (!convexPath.isConvex()) {
	throw new IllegalArgumentException("path must be convex");
	}

	if (mPath == null) {		if (mPath == null) {
	mPath = new Path();		mPath = new Path();
	}		}