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

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

Merge "Ensure picture isn't recording in createBitmap" into pi-dev

parents 4eca92d5 44fc6317

graphics/java/android/graphics/Bitmap.java

+1 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,7 @@ public final class Bitmap implements Parcelable { 
        if (config == null) {

            throw new IllegalArgumentException("Config must not be null");

        }

        source.endRecording();

        if (source.requiresHardwareAcceleration() && config != Config.HARDWARE) {

            StrictMode.noteSlowCall("GPU readback");

        }

graphics/java/android/graphics/Picture.java

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ public class Picture { 
     * drawn to a hardware-accelerated canvas. If this returns true then this Picture can only

     * be drawn to another Picture or to a Canvas where canvas.isHardwareAccelerated() is true.

     *

     * Note this value is only updated after recording has finished by a call to

     * {@link #endRecording()}. Prior to that it will be the default value of false.

     *

     * @return true if the Picture can only be drawn to a hardware-accelerated canvas,

     *         false otherwise.

     */