From dcfa46c5cacd137c7e95e8b9a86e5bf348cef6e0 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Fri, 3 Apr 2020 16:58:12 -0700 Subject: Fixed an issue where the conversation title was showing doubled For conversations, it's not necessary anymore to extract the conversation title into the heads up layout. Fixes: 152655946 Test: add conversation group, observe no double text Change-Id: I99594ae9e503cf8589603899e0053793be96958a --- core/java/android/app/Notification.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index f461a1708373..7a593498e967 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -7158,7 +7158,8 @@ public class Notification implements Parcelable CharSequence conversationTitle = !TextUtils.isEmpty(super.mBigContentTitle) ? super.mBigContentTitle : mConversationTitle; - if (!TextUtils.isEmpty(conversationTitle) && !hasOnlyWhiteSpaceSenders()) { + if (mConversationType == CONVERSATION_TYPE_LEGACY + && !TextUtils.isEmpty(conversationTitle) && !hasOnlyWhiteSpaceSenders()) { return conversationTitle; } return null; -- cgit v1.2.3-59-g8ed1b