From b786bbdd1164cf3ca7fcfb8448c7c619a82118a0 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 10 Jun 2015 16:58:42 -0700 Subject: Workaround shader crash bug:21706035 Change-Id: Ia1cd4824c742b2d6fc0feb2861ccfde0b6ac2189 --- core/jni/android/graphics/Shader.cpp | 6 +++++- graphics/java/android/graphics/BitmapShader.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/jni/android/graphics/Shader.cpp b/core/jni/android/graphics/Shader.cpp index d0f7591..ad3a5e2 100644 --- a/core/jni/android/graphics/Shader.cpp +++ b/core/jni/android/graphics/Shader.cpp @@ -84,7 +84,11 @@ static jlong BitmapShader_constructor(JNIEnv* env, jobject o, jobject jbitmap, jint tileModeX, jint tileModeY) { SkBitmap bitmap; - GraphicsJNI::getSkBitmap(env, jbitmap, &bitmap); + if (jbitmap) { + // Only pass a valid SkBitmap object to the constructor if the Bitmap exists. Otherwise, + // we'll pass an empty SkBitmap to avoid crashing/excepting for compatibility. + GraphicsJNI::getSkBitmap(env, jbitmap, &bitmap); + } SkShader* s = SkShader::CreateBitmapShader(bitmap, (SkShader::TileMode)tileModeX, (SkShader::TileMode)tileModeY); diff --git a/graphics/java/android/graphics/BitmapShader.java b/graphics/java/android/graphics/BitmapShader.java index bd74bc8..9211225 100644 --- a/graphics/java/android/graphics/BitmapShader.java +++ b/graphics/java/android/graphics/BitmapShader.java @@ -16,6 +16,8 @@ package android.graphics; +import android.annotation.NonNull; + /** * Shader used to draw a bitmap as a texture. The bitmap can be repeated or * mirrored by setting the tiling mode. @@ -38,7 +40,7 @@ public class BitmapShader extends Shader { * @param tileX The tiling mode for x to draw the bitmap in. * @param tileY The tiling mode for y to draw the bitmap in. */ - public BitmapShader(Bitmap bitmap, TileMode tileX, TileMode tileY) { + public BitmapShader(@NonNull Bitmap bitmap, TileMode tileX, TileMode tileY) { mBitmap = bitmap; mTileX = tileX; mTileY = tileY; -- cgit v1.1