Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev

am: c015719

* commit 'c015719954d9a1c0a53f277f68405401207a0c65':
  DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB

Change-Id: I3f5e7bd67b57d074939e1db6ef0651ade46d31bf

core/java/android/view/DisplayListCanvas.java

@@ -37,6 +37,8 @@ public class DisplayListCanvas extends Canvas {
     // view hierarchy because display lists are generated recursively.
     private static final int POOL_LIMIT = 25;
 
+    private static final int MAX_BITMAP_SIZE = 100 * 1024 * 1024; // 100 MB
+
     private static final SynchronizedPool<DisplayListCanvas> sPool =
             new SynchronizedPool<DisplayListCanvas>(POOL_LIMIT);
 
@@ -249,4 +251,14 @@ public class DisplayListCanvas extends Canvas {
 
     private static native void nDrawRoundRect(long renderer, long propLeft, long propTop,
             long propRight, long propBottom, long propRx, long propRy, long propPaint);
+
+    @Override
+    protected void throwIfCannotDraw(Bitmap bitmap) {
+        super.throwIfCannotDraw(bitmap);
+        int bitmapSize = bitmap.getByteCount();
+        if (bitmapSize > MAX_BITMAP_SIZE) {
+            throw new RuntimeException(
+                    "Canvas: trying to draw too large(" + bitmapSize + "bytes) bitmap.");
+        }
+    }
 }

graphics/java/android/graphics/Canvas.java

@@ -1266,7 +1266,7 @@ public class Canvas {
     /**
      * @hide
      */
-    protected static void throwIfCannotDraw(Bitmap bitmap) {
+    protected void throwIfCannotDraw(Bitmap bitmap) {
         if (bitmap.isRecycled()) {
             throw new RuntimeException("Canvas: trying to use a recycled bitmap " + bitmap);
         }