commit d2dcd46518d7e68fa4d27f858d711f64ebd62765
author Selim Cinek <cinek@google.com> Fri Mar 20 17:18:52 2020 -0700
committer Selim Cinek <cinek@google.com> Sat Mar 21 00:23:15 2020 +0000
tree 5beca0f60b4ac6b9ad777d39d2a7cddfb1f0267c
parent ecf248f633199ba84467cec05f8cc449608a6dd2

Fixed an issue where the largeIcon wouldn't be shown for non-shortcuts

We should only use the shortcut icon if it's available

Bug: 150905003
Test: add group message from Notify with largeIcon
Change-Id: Icd5b0991b34fbfb517344cc6c908a2588973cdca

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index b58a85e..36898ec 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -7585,7 +7585,9 @@
             }
             boolean isConversationLayout = mConversationType != CONVERSATION_TYPE_LEGACY;
             boolean isImportantConversation = mConversationType == CONVERSATION_TYPE_IMPORTANT;
-            Icon largeIcon = isConversationLayout ? mShortcutIcon : mBuilder.mN.mLargeIcon;
+            Icon largeIcon = isConversationLayout && mShortcutIcon != null
+                    ? mShortcutIcon
+                    : mBuilder.mN.mLargeIcon;
             TemplateBindResult bindResult = new TemplateBindResult();
             StandardTemplateParams p = mBuilder.mParams.reset()
                     .hasProgress(false)