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

am 382225af: Merge "Null check when reconstituting legacy icon data." into mnc-dev

Browse Source 
* commit '382225af479964a1677a76fe8d8f69d577ddb912':
  Null check when reconstituting legacy icon data.
This commit is contained in:
Dan Sandler
2015-06-10 18:13:37 +00:00
committed by Android Git Automerger
parent 0fac11a8ce 382225af47
commit 07a07e1497
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/notification/NotificationListenerService.java
View File

@@ -646,7 +646,7 @@ public abstract class NotificationListenerService extends Service {
private void createLegacyIconExtras(Notification n) {
Icon smallIcon = n.getSmallIcon();
Icon largeIcon = n.getLargeIcon();
if (smallIcon.getType() == Icon.TYPE_RESOURCE) {
if (smallIcon != null && smallIcon.getType() == Icon.TYPE_RESOURCE) {
n.extras.putInt(Notification.EXTRA_SMALL_ICON, smallIcon.getResId());
n.icon = smallIcon.getResId();
}