diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-28 18:49:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-28 18:49:19 +0000 |
| commit | 6cdc6b9f05ba0ab1abad5ab662e208b7b3c18485 (patch) | |
| tree | 27c03557e922f802b19bb9761667228a0cfe3fb4 | |
| parent | aab143fd6543773798ee23c435b83405a2f21f63 (diff) | |
| parent | 81284287a761a9ee512bd7d4857995fdd8d8dcbc (diff) | |
| download | android_packages_apps_Trebuchet-6cdc6b9f05ba0ab1abad5ab662e208b7b3c18485.tar.gz android_packages_apps_Trebuchet-6cdc6b9f05ba0ab1abad5ab662e208b7b3c18485.tar.bz2 android_packages_apps_Trebuchet-6cdc6b9f05ba0ab1abad5ab662e208b7b3c18485.zip | |
am 81284287: am de9590be: Adding null check when creating icon bitmap
* commit '81284287a761a9ee512bd7d4857995fdd8d8dcbc':
Adding null check when creating icon bitmap
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 31c141460..082800c29 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -225,7 +225,7 @@ public final class Utilities { // 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()); } } |