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

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

Revert^2 "Be prepared for 8k video frames in bitmaps" 

This reverts commit 0560ed0d.

Reason for revert: code is correct, test is wrong. Test fix in topic

Change-Id: Ic72a10ef11e14705ee39984ee7fe3f17d33794e4
parent 0560ed0d

graphics/java/android/graphics/RecordingCanvas.java

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public final class RecordingCanvas extends BaseRecordingCanvas { 


    /** @hide */

    private static int getPanelFrameSize() {

        final int DefaultSize = 100 * 1024 * 1024; // 100 MB;

        final int DefaultSize = 150 * 1024 * 1024; // 150 MB;

        return Math.max(SystemProperties.getInt("ro.hwui.max_texture_allocation_size", DefaultSize),

                DefaultSize);

    }
@@ -262,7 +262,7 @@ public final class RecordingCanvas extends BaseRecordingCanvas { 
    protected void throwIfCannotDraw(Bitmap bitmap) {

        super.throwIfCannotDraw(bitmap);

        int bitmapSize = bitmap.getByteCount();

        if (bitmapSize > MAX_BITMAP_SIZE) {

        if (bitmap.getConfig() != Bitmap.Config.HARDWARE && bitmapSize > MAX_BITMAP_SIZE) {

            throw new RuntimeException(

                    "Canvas: trying to draw too large(" + bitmapSize + "bytes) bitmap.");

        }