Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '3d1115dba5ca4715a81502352ad3e2a7a1a6a7af':
  Fixes cloned notification actions missing icon.
This commit is contained in:
Gus Prevas
2015-09-10 19:48:03 +00:00
committed by Android Git Automerger
parent f327fd34c9 3d1115dba5
commit 27cb56703d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/Notification.java
View File

@@ -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();