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

Commit 7a740774 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Drop gainmaps if edited with Canvas" into main

parents 2f4e88a2 367ddbf3

graphics/java/android/graphics/Canvas.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -114,6 +114,7 @@ public class Canvas extends BaseCanvas { 
            throw new IllegalStateException("Immutable bitmap passed to Canvas constructor");

            throw new IllegalStateException("Immutable bitmap passed to Canvas constructor");

        }

        }

        throwIfCannotDraw(bitmap);

        throwIfCannotDraw(bitmap);

        bitmap.setGainmap(null);

        mNativeCanvasWrapper = nInitRaster(bitmap.getNativeInstance());

        mNativeCanvasWrapper = nInitRaster(bitmap.getNativeInstance());

        mFinalizer = NoImagePreloadHolder.sRegistry.registerNativeAllocation(

        mFinalizer = NoImagePreloadHolder.sRegistry.registerNativeAllocation(

                this, mNativeCanvasWrapper);

                this, mNativeCanvasWrapper);
@@ -178,7 +179,7 @@ public class Canvas extends BaseCanvas { 
                throw new IllegalStateException();

                throw new IllegalStateException();

            }

            }

            throwIfCannotDraw(bitmap);

            throwIfCannotDraw(bitmap);



            bitmap.setGainmap(null);

            nSetBitmap(mNativeCanvasWrapper, bitmap.getNativeInstance());

            nSetBitmap(mNativeCanvasWrapper, bitmap.getNativeInstance());

            mDensity = bitmap.mDensity;

            mDensity = bitmap.mDensity;

        }

        }