Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 367ddbf3 authored by John Reck's avatar John Reck
Browse files

Drop gainmaps if edited with Canvas 

Test: atest GainmapTests
Change-Id: Iff9bd869d5d01d8329767e7d5fe33d5ce1eea0b4
parent 14828817

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;

        }