commit cbdfc598fae13f5aa7f7263351872d160004fbe7
author Sunny Goyal <sunnygoyal@google.com> Mon Oct 16 01:03:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 16 01:03:08 2017 +0000
tree 126919ddcf499197f0a6e96347fb57a0d340a863
parent 55094653170c2ded40dcbad2c6a89a2771009c96
parent f1fbc3fbe78997f141e2770221fe5ab1b1e68014

Merge "Converting widget panel into a floating view" into ub-launcher3-master

src/com/android/launcher3/notification/NotificationInfo.java

diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java
index 8ef10e3..120de04 100644
--- a/src/com/android/launcher3/notification/NotificationInfo.java
+++ b/src/com/android/launcher3/notification/NotificationInfo.java
@@ -72,7 +72,7 @@
         if (icon == null) {
             // Use the small icon.
             icon = notification.getSmallIcon();
-            mIconDrawable = icon.loadDrawable(context);
+            mIconDrawable = icon == null ? null : icon.loadDrawable(context);
             mIconColor = statusBarNotification.getNotification().color;
             mIsIconLarge = false;
         } else {