commit 2ff529a57542772d710026435b87ab7a6b3ed25c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 16 22:16:11 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 16 22:16:11 2017 +0000
tree 5abbca73cd73b39dc7cd941b389a8752c1dab56a
parent 2069fe78c3bd639faf4758a25af88133f152479e
parent e11adb57acf19b5aaf8ef7d8ed0fa5fe54e91606

Merge "Import translations. DO NOT MERGE" into ub-launcher3-dorval-polish2

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 {