commit f5bff46f6a81e5d2418bcedec8f8ae320bdfaba8
author Gus Prevas <kprevas@google.com> Mon Aug 24 10:34:28 2015 -0400
committer Gus Prevas <kprevas@google.com> Thu Sep 10 13:13:45 2015 -0400
tree acee59b18d3e2ab39649946ab29f8fc837aabef9
parent ad9a0efc070f8a948f943d52a43dccf54e49db61

Fixes cloned notification actions missing icon.

This change modifies the Notification.Action constructor
to populate the deprecated "icon" field based on the provided icon.
This field is still used by NotificationCompatApi20
to create a NotificationCompatBase.Action from a Notification.Action.

Bug: 23348968
Bug: 22591778
Change-Id: I3576038384d2baa12c4c75bc4124e3859aacbd13

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 9381327..55aec59 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -953,6 +953,9 @@
         private Action(Icon icon, CharSequence title, PendingIntent intent, Bundle extras,
                 RemoteInput[] remoteInputs) {
             this.mIcon = icon;
+            if (icon != null && icon.getType() == Icon.TYPE_RESOURCE) {
+                this.icon = icon.getResId();
+            }
             this.title = title;
             this.actionIntent = intent;
             this.mExtras = extras != null ? extras : new Bundle();