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

Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev

Browse Source
This commit is contained in:
Dan Sandler
2015-03-18 18:23:19 +00:00
committed by Android (Google) Code Review
parent 8d3f587f15 06433bd9f3
commit b3a1b6632e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java
View File

@@ -79,7 +79,8 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper {
// If the icon already has a color filter, we assume that we already forced the icon to be
// white when we created the notification.
mIconForceGraysaleWhenDark = mIcon != null && mIcon.getDrawable().getColorFilter() != null;
final Drawable iconDrawable = mIcon != null ? mIcon.getDrawable() : null;
mIconForceGraysaleWhenDark = iconDrawable != null && iconDrawable.getColorFilter() != null;
}
private ImageView resolveIcon(ImageView largeIcon, ImageView rightIcon) {