diff options
| author | Romain Guy <romainguy@google.com> | 2012-02-07 19:40:19 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2012-02-07 19:40:19 -0800 |
| commit | bc52cce276b6238e8f30f71a0dcf24209481261e (patch) | |
| tree | 2d7390ffd32e351f13ea5a0abe955efda7374385 /core | |
| parent | 5b6abb38f0892f429976bd6976f93ae216b21d38 (diff) | |
| download | frameworks_base-bc52cce276b6238e8f30f71a0dcf24209481261e.zip frameworks_base-bc52cce276b6238e8f30f71a0dcf24209481261e.tar.gz frameworks_base-bc52cce276b6238e8f30f71a0dcf24209481261e.tar.bz2 | |
Better error message when drawing with recycled bitmaps
Change-Id: Ie8332261c4376f270ea630d775210198c0196447
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/GLES20Canvas.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index fa4dd25..1e92b43 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -723,6 +723,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawPatch(Bitmap bitmap, byte[] chunks, RectF dst, Paint paint) { + if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); // Shaders are ignored when drawing patches int modifier = paint != null ? setupColorFilter(paint) : MODIFIER_NONE; final int nativePaint = paint == null ? 0 : paint.mNativePaint; @@ -736,6 +737,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmap(Bitmap bitmap, float left, float top, Paint paint) { + if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); // Shaders are ignored when drawing bitmaps int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE; final int nativePaint = paint == null ? 0 : paint.mNativePaint; @@ -748,6 +750,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmap(Bitmap bitmap, Matrix matrix, Paint paint) { + if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); // Shaders are ignored when drawing bitmaps int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE; final int nativePaint = paint == null ? 0 : paint.mNativePaint; @@ -761,6 +764,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmap(Bitmap bitmap, Rect src, Rect dst, Paint paint) { + if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); // Shaders are ignored when drawing bitmaps int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE; final int nativePaint = paint == null ? 0 : paint.mNativePaint; @@ -784,6 +788,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmap(Bitmap bitmap, Rect src, RectF dst, Paint paint) { + if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); // Shaders are ignored when drawing bitmaps int modifiers = paint != null ? setupModifiers(bitmap, paint) : MODIFIER_NONE; final int nativePaint = paint == null ? 0 : paint.mNativePaint; @@ -832,6 +837,7 @@ class GLES20Canvas extends HardwareCanvas { @Override public void drawBitmapMesh(Bitmap bitmap, int meshWidth, int meshHeight, float[] verts, int vertOffset, int[] colors, int colorOffset, Paint paint) { + if (bitmap.isRecycled()) throw new IllegalArgumentException("Cannot draw recycled bitmaps"); if (meshWidth < 0 || meshHeight < 0 || vertOffset < 0 || colorOffset < 0) { throw new ArrayIndexOutOfBoundsException(); } |