Fix BitmapDrawable outline crash

bug:17103753

Change-Id: Ia3d2c7d61b3f3b9ea8879f941d726d8627e155bb
This commit is contained in:
Chris Craik
2014-08-18 11:26:31 -07:00
parent 49e057d7ee
commit 9745de0f05

View File

@@ -602,9 +602,9 @@ public class BitmapDrawable extends Drawable {
@Override
public void getOutline(@NonNull Outline outline) {
super.getOutline(outline);
if (mBitmapState.mBitmap.hasAlpha()) {
// Bitmaps with alpha can't report a non-0 alpha,
// since they may not fill their rectangular bounds
if (mBitmapState.mBitmap == null || mBitmapState.mBitmap.hasAlpha()) {
// Only opaque Bitmaps can report a non-0 alpha,
// since only they are guaranteed to fill their bounds
outline.setAlpha(0.0f);
}
}