From 9e94c28c9655e59df9c39804d90c77938f76cabc Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Mon, 27 Jan 2020 15:52:28 -0800
Subject: Make sure the icon of the sender isn't null

Test: make a test app bubble and look at the logs, note there is no NPE
      (I wasn't seeing an explicit crash, I think because something in
       eng config was hiding it somehow?)
Bug: none

Change-Id: I67a073ebb273e86e2a9fca0f6eaf6d415db5afc5
---
 .../SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java
index 6e23777babd9..55a7a11987fc 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java
@@ -246,7 +246,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask
                     bubbleMessage.senderName = sender != null
                             ? sender.getName()
                             : null;
-                    bubbleMessage.senderAvatar = sender != null
+                    bubbleMessage.senderAvatar = sender != null && sender.getIcon() != null
                             ? sender.getIcon().loadDrawable(context)
                             : null;
                     return bubbleMessage;
-- 
cgit v1.2.3-59-g8ed1b