From 367ddbf3e800b11aef37fee007cb0b502f0ab334 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 28 Sep 2023 12:50:23 -0400
Subject: Drop gainmaps if edited with Canvas

Test: atest GainmapTests
Change-Id: Iff9bd869d5d01d8329767e7d5fe33d5ce1eea0b4
---
 graphics/java/android/graphics/Canvas.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index e7814cbd67e7..d1aceafc4e2c 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -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;
         }
-- 
cgit v1.2.3-59-g8ed1b