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

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

Merge "return 0 for allocation size if recycled"

parents c423d000 3bdecbf0

graphics/java/android/graphics/Bitmap.java

+10 −0
Original line number Diff line number Diff line
@@ -1241,6 +1241,11 @@ public final class Bitmap implements Parcelable { 
     * #getAllocationByteCount()}.</p>

     */

    public final int getByteCount() {

        if (mRecycled) {

            Log.w(TAG, "Called getByteCount() on a recycle()'d bitmap! "

                    + "This is undefined behavior!");

            return 0;

        }

        // int result permits bitmaps up to 46,340 x 46,340

        return getRowBytes() * getHeight();

    }
@@ -1260,6 +1265,11 @@ public final class Bitmap implements Parcelable { 
     * @see #reconfigure(int, int, Config)

     */

    public final int getAllocationByteCount() {

        if (mRecycled) {

            Log.w(TAG, "Called getAllocationByteCount() on a recycle()'d bitmap! "

                    + "This is undefined behavior!");

            return 0;

        }

        return nativeGetAllocationByteCount(mNativePtr);

    }