commit 1f029d7d54a0779c3a6bab276ad2fa8336a67b4b
author Sunny Goyal <sunnygoyal@google.com> Wed May 20 07:02:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 20 07:02:43 2015 +0000
tree 16065e7f97d9f85fdb2d6e9e33ad4bb7bc6eb15f
parent 0518b405715a411e45eeed364909c582a29ed9c5
parent a938867bc87faf7b35c9fc20192920f812ef5d5e

am a938867b: Merge "Adding null check to outline generator" into ub-launcher3-burnaby

* commit 'a938867bc87faf7b35c9fc20192920f812ef5d5e':
  Adding null check to outline generator

src/com/android/launcher3/HolographicOutlineHelper.java

diff --git a/src/com/android/launcher3/HolographicOutlineHelper.java b/src/com/android/launcher3/HolographicOutlineHelper.java
index 4a04d03..5ff85d6 100644
--- a/src/com/android/launcher3/HolographicOutlineHelper.java
+++ b/src/com/android/launcher3/HolographicOutlineHelper.java
@@ -157,6 +157,9 @@
 
     Bitmap createMediumDropShadow(BubbleTextView view) {
         Drawable icon = view.getIcon();
+        if (icon == null) {
+            return null;
+        }
         Rect rect = icon.getBounds();
 
         int bitmapWidth = (int) (rect.width() * view.getScaleX());