commit 55094653170c2ded40dcbad2c6a89a2771009c96
author Tony Wickham <twickham@google.com> Fri Oct 13 21:18:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 13 21:18:19 2017 +0000
tree effc9d320ba4983bbf96e43b0a51eb432a1f0d7c
parent 10a1bd0e652ec7ea3e3ee861fc0d72261a33a3fd
parent d4899cfc2ffc3ce2815e3e4824638b8370a2858e

Merge changes from topic "am-cd88620d-8a17-4592-86c7-f98ff940a436" into ub-launcher3-master

* changes:
  [automerger] Handle null small icon am: 207f7d7f86
  Handle null small icon

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 {