diff options
| author | 2020-01-27 15:52:28 -0800 | |
|---|---|---|
| committer | 2020-01-27 15:52:28 -0800 | |
| commit | 9e94c28c9655e59df9c39804d90c77938f76cabc (patch) | |
| tree | 2dad914a6b88e8a95ee9309f70d87db5a3e13ee9 | |
| parent | d21c45fc95c64e3139016954bb099e057299037b (diff) | |
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
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |