am 94a47646: am 27cb5670: am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev

* commit '94a4764649f3611806b95d3f1394ea9f77e30459':
  Fixes cloned notification actions missing icon.

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 93813279c0dc..55aec5906cac 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -953,6 +953,9 @@ public class Notification implements Parcelable
         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();