commit 9745de0f0559bccd7b4a2f80b5ff8c8f118c7bfc
author Chris Craik <ccraik@google.com> Mon Aug 18 11:26:31 2014 -0700
committer Chris Craik <ccraik@google.com> Mon Aug 18 11:32:13 2014 -0700
tree 2eccc467124ef5c847934925675b7accc8967076
parent 49e057d7eedb44f5397781254acab4e0ef08a9cf

Fix BitmapDrawable outline crash

bug:17103753

Change-Id: Ia3d2c7d61b3f3b9ea8879f941d726d8627e155bb

graphics/java/android/graphics/drawable/BitmapDrawable.java

diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java
index 40adf94..e52d778 100644
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -602,9 +602,9 @@
     @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);
         }
     }