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

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

Browse Source 
* commit 'b3a1b6632e403926fed995e851a8e44fc944c663':
  Avoid crashing on corrupted notifications.
This commit is contained in:
Dan Sandler
2015-03-18 18:29:48 +00:00
committed by Android Git Automerger
parent 96693b2977 b3a1b6632e
commit 7662079160
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 // If the icon already has a color filter, we assume that we already forced the icon to be
// white when we created the notification. // 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) { private ImageView resolveIcon(ImageView largeIcon, ImageView rightIcon) {