summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/java/android/graphics/drawable/BitmapDrawable.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java
index 40adf94286bc..e52d778b1187 100644
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -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);
}
}