commit d4899cfc2ffc3ce2815e3e4824638b8370a2858e
author Android Build Merger (Role) <android-build-merger@google.com> Fri Oct 06 21:03:28 2017 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> Fri Oct 06 21:03:28 2017 +0000
tree 0195c49b31652d5e638320faa1ff7d5a233a5edf
parent 271e219ea3423ada57a55b54395beeef64fb401c
parent 207f7d7f86ec858969c25c1829965311a7eea58a

[automerger] Handle null small icon am: 207f7d7f86

Change-Id: I2003fe3d654829f8a2d1d16a38213cf5a262650f

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 6e36f4f..26f9346 100644
--- a/src/com/android/launcher3/notification/NotificationInfo.java
+++ b/src/com/android/launcher3/notification/NotificationInfo.java
@@ -73,7 +73,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 {