summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/notification
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-10-06 21:03:28 +0000
committerAndroid Build Merger (Role) <android-build-merger@google.com>2017-10-06 21:03:28 +0000
commitd4899cfc2ffc3ce2815e3e4824638b8370a2858e (patch)
tree0195c49b31652d5e638320faa1ff7d5a233a5edf /src/com/android/launcher3/notification
parent271e219ea3423ada57a55b54395beeef64fb401c (diff)
parent207f7d7f86ec858969c25c1829965311a7eea58a (diff)
downloadpackages_apps_Trebuchet-d4899cfc2ffc3ce2815e3e4824638b8370a2858e.tar.gz
packages_apps_Trebuchet-d4899cfc2ffc3ce2815e3e4824638b8370a2858e.tar.bz2
packages_apps_Trebuchet-d4899cfc2ffc3ce2815e3e4824638b8370a2858e.zip
[automerger] Handle null small icon am: 207f7d7f86
Change-Id: I2003fe3d654829f8a2d1d16a38213cf5a262650f
Diffstat (limited to 'src/com/android/launcher3/notification')
-rw-r--r--src/com/android/launcher3/notification/NotificationInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java
index 6e36f4f51..26f934643 100644
--- a/src/com/android/launcher3/notification/NotificationInfo.java
+++ b/src/com/android/launcher3/notification/NotificationInfo.java
@@ -73,7 +73,7 @@ public class NotificationInfo implements View.OnClickListener {
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 {