From 9f11749b11a652edeb26f3ff5ffe4bf8e0b6b5bc Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 13 May 2024 23:04:48 +0000 Subject: Revert^2 "Be prepared for 8k video frames in bitmaps" This reverts commit 0560ed0d8c679a6b406488c1420732327ceb01d4. Reason for revert: code is correct, test is wrong. Test fix in topic Change-Id: Ic72a10ef11e14705ee39984ee7fe3f17d33794e4 --- graphics/java/android/graphics/RecordingCanvas.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/RecordingCanvas.java b/graphics/java/android/graphics/RecordingCanvas.java index 635e78e674be..cc5b3b94e0fa 100644 --- a/graphics/java/android/graphics/RecordingCanvas.java +++ b/graphics/java/android/graphics/RecordingCanvas.java @@ -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."); } -- cgit v1.2.3-59-g8ed1b