Merge "Drop gainmaps if edited with Canvas" into main (7a740774) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/Canvas.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ public class Canvas extends BaseCanvas {
		throw new IllegalStateException("Immutable bitmap passed to Canvas constructor");
		}
		throwIfCannotDraw(bitmap);
		bitmap.setGainmap(null);
		mNativeCanvasWrapper = nInitRaster(bitmap.getNativeInstance());
		mFinalizer = NoImagePreloadHolder.sRegistry.registerNativeAllocation(
		this, mNativeCanvasWrapper);
		@@ -178,7 +179,7 @@ public class Canvas extends BaseCanvas {
		throw new IllegalStateException();
		}
		throwIfCannotDraw(bitmap);

		bitmap.setGainmap(null);
		nSetBitmap(mNativeCanvasWrapper, bitmap.getNativeInstance());
		mDensity = bitmap.mDensity;
		}