From 207f7d7f86ec858969c25c1829965311a7eea58a Mon Sep 17 00:00:00 2001 From: Tony Date: Fri, 6 Oct 2017 13:46:55 -0700 Subject: [PATCH] Handle null small icon It shouldn't be possible to have a null small icon, but apparently there are cases where we get one anyway. Might as well handle it gracefully instead of crashing. Bug: 67156108 Change-Id: I01ad0251920f7f531a3019eb694946c3d295f9de --- src/com/android/launcher3/notification/NotificationInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java index 1b7c87b229..f54a50d459 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 {