diff options
| author | Gus Prevas <kprevas@google.com> | 2015-09-10 19:48:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-10 19:48:03 +0000 |
| commit | 27cb56703d350b441a2e9efc55bd16dd5b1528e7 (patch) | |
| tree | c458e86c8b5315425a505f16e8136266b64aa3da /core/java | |
| parent | f327fd34c94781469e0219e27b91f25039cfb2cb (diff) | |
| parent | 3d1115dba5ca4715a81502352ad3e2a7a1a6a7af (diff) | |
am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev
* commit '3d1115dba5ca4715a81502352ad3e2a7a1a6a7af':
Fixes cloned notification actions missing icon.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Notification.java | 3 |
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(); |