commit 81284287a761a9ee512bd7d4857995fdd8d8dcbc
author Sunny Goyal <sunnygoyal@google.com> Mon Sep 28 18:46:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 28 18:46:18 2015 +0000
tree 7725cbf636cd7f0b19d4aa17d93d4226fc6fe61b
parent f768d934682ba80da89d454543928e629a44103d
parent de9590be4ca2779ae0f7f64a48ac8b90472484f8

am de9590be: Adding null check when creating icon bitmap

* commit 'de9590be4ca2779ae0f7f64a48ac8b90472484f8':
  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 d5b2898..d054da3 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -211,7 +211,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());
                 }
             }