commit 48d746ab3294afca064ba2598a5c9daba4807c42
author Adrian Roos <roosa@google.com> Tue Apr 12 14:57:28 2016 -0700
committer Adrian Roos <roosa@google.com> Tue Apr 12 15:00:31 2016 -0700
tree e653ed078c1ef1f865d3ee457885e690ddc02a7c
parent 5dc3c674a2635179d17e96af8fb248142e03b87e

Fix broken actions with MessagingStyle

Bug: 27250207
Change-Id: I073bb0ef055423a6c152af0e98fe846b15511d11

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 520acf5..052874f 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3308,7 +3308,16 @@
         }
 
         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 @@
                     : mConversationTitle;
             boolean hasTitle = !TextUtils.isEmpty(title);
 
-            RemoteViews contentView = mBuilder.applyStandardTemplate(
+            RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(
                     mBuilder.getMessagingLayoutResource(),
                     false /* hasProgress */,
                     title,