Merge "Check recycled when createBitmap" am: cc9f4923d2 am: 2b8063d780 (171beb55) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Bitmap.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -836,7 +836,7 @@ public final class Bitmap implements Parcelable {
	* @return A bitmap that represents the specified subset of source		* @return A bitmap that represents the specified subset of source
	* @throws IllegalArgumentException if the x, y, width, height values are		* @throws IllegalArgumentException if the x, y, width, height values are
	* outside of the dimensions of the source bitmap, or width is <= 0,		* outside of the dimensions of the source bitmap, or width is <= 0,
	* or height is <= 0		* or height is <= 0, or if the source bitmap has already been recycled
	*/		*/
	public static Bitmap createBitmap(@NonNull Bitmap source, int x, int y, int width, int height,		public static Bitmap createBitmap(@NonNull Bitmap source, int x, int y, int width, int height,
	@Nullable Matrix m, boolean filter) {		@Nullable Matrix m, boolean filter) {
	@@ -849,6 +849,9 @@ public final class Bitmap implements Parcelable {
	if (y + height > source.getHeight()) {		if (y + height > source.getHeight()) {
	throw new IllegalArgumentException("y + height must be <= bitmap.height()");		throw new IllegalArgumentException("y + height must be <= bitmap.height()");
	}		}
			if (source.isRecycled()) {
			throw new IllegalArgumentException("cannot use a recycled source in createBitmap");
			}

	// check if we can just return our argument unchanged		// check if we can just return our argument unchanged
	if (!source.isMutable() && x == 0 && y == 0 && width == source.getWidth() &&		if (!source.isMutable() && x == 0 && y == 0 && width == source.getWidth() &&