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

Commit a34ad120 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Do not return a closed HardwareBuffer"

parents 6b68b2e3 28db3383

graphics/java/android/graphics/Bitmap.java

+1 −1
Original line number Diff line number Diff line
@@ -2250,7 +2250,7 @@ public final class Bitmap implements Parcelable { 
    public @NonNull HardwareBuffer getHardwareBuffer() {

        checkRecycled("Can't getHardwareBuffer from a recycled bitmap");

        HardwareBuffer hardwareBuffer = mHardwareBuffer == null ? null : mHardwareBuffer.get();

        if (hardwareBuffer == null) {

        if (hardwareBuffer == null || hardwareBuffer.isClosed()) {

            hardwareBuffer = nativeGetHardwareBuffer(mNativePtr);

            mHardwareBuffer = new WeakReference<HardwareBuffer>(hardwareBuffer);

        }