From 48d746ab3294afca064ba2598a5c9daba4807c42 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Tue, 12 Apr 2016 14:57:28 -0700 Subject: [PATCH] Fix broken actions with MessagingStyle Bug: 27250207 Change-Id: I073bb0ef055423a6c152af0e98fe846b15511d11 --- core/java/android/app/Notification.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 520acf502f0d0..052874f77ce67 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3308,7 +3308,16 @@ public class Notification implements Parcelable } private RemoteViews applyStandardTemplateWithActions(int layoutId) { - RemoteViews big = applyStandardTemplate(layoutId); + final Bundle ex = mN.extras; + + CharSequence title = processLegacyText(ex.getCharSequence(EXTRA_TITLE)); + CharSequence text = processLegacyText(ex.getCharSequence(EXTRA_TEXT)); + return applyStandardTemplateWithActions(layoutId, true /* hasProgress */, title, text); + } + + private RemoteViews applyStandardTemplateWithActions(int layoutId, boolean hasProgress, + CharSequence title, CharSequence text) { + RemoteViews big = applyStandardTemplate(layoutId, hasProgress, title, text); resetStandardTemplateWithActions(big); @@ -4429,7 +4438,7 @@ public class Notification implements Parcelable : mConversationTitle; boolean hasTitle = !TextUtils.isEmpty(title); - RemoteViews contentView = mBuilder.applyStandardTemplate( + RemoteViews contentView = mBuilder.applyStandardTemplateWithActions( mBuilder.getMessagingLayoutResource(), false /* hasProgress */, title,