Merge "Revert^2 "Be prepared for 8k video frames in bitmaps"" into main (6604f36e) · Commits · e / os / android_frameworks_base

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.");
		}