Merge "Merge "Set the color space as nullptr on native bitmaps when sRGB is... (46fcffdd) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Bitmap.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -996,7 +996,9 @@ public final class Bitmap implements Parcelable {
		}

		Bitmap bm;
		if (config != Config.ARGB_8888) {
		// nullptr color spaces have a particular meaning in native and are interpreted as sRGB
		// (we also avoid the unnecessary extra work of the else branch)
		if (config != Config.ARGB_8888 \|\| colorSpace == ColorSpace.get(ColorSpace.Named.SRGB)) {
		bm = nativeCreate(null, 0, width, width, height, config.nativeInt, true, null, null);
		} else {
		if (!(colorSpace instanceof ColorSpace.Rgb)) {