commit 6cdc6b9f05ba0ab1abad5ab662e208b7b3c18485
author Sunny Goyal <sunnygoyal@google.com> Mon Sep 28 18:49:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 28 18:49:19 2015 +0000
tree 27c03557e922f802b19bb9761667228a0cfe3fb4
parent aab143fd6543773798ee23c435b83405a2f21f63
parent 81284287a761a9ee512bd7d4857995fdd8d8dcbc

am 81284287: am de9590be: Adding null check when creating icon bitmap

* commit '81284287a761a9ee512bd7d4857995fdd8d8dcbc':
  Adding null check when creating icon bitmap

src/com/android/launcher3/Utilities.java

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 31c1414..082800c 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -225,7 +225,7 @@
                 // Ensure the bitmap has a density.
                 BitmapDrawable bitmapDrawable = (BitmapDrawable) icon;
                 Bitmap bitmap = bitmapDrawable.getBitmap();
-                if (bitmap.getDensity() == Bitmap.DENSITY_NONE) {
+                if (bitmap != null && bitmap.getDensity() == Bitmap.DENSITY_NONE) {
                     bitmapDrawable.setTargetDensity(context.getResources().getDisplayMetrics());
                 }
             }