diff options
| author | Dan Sandler <dsandler@android.com> | 2015-03-18 18:42:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 18:42:47 +0000 |
| commit | b509a809b20d1eae76613b43a93059c32c4a8435 (patch) | |
| tree | b1ce7f2d620f0415a440dd65045f7dd6f2c43cfa /packages/SystemUI | |
| parent | 42e0a6316f21e1a461351500ebc6cd1801f8b52c (diff) | |
| parent | fbd99e9fecea1cf467c082d2096cb1c3868685d4 (diff) | |
| download | frameworks_base-b509a809b20d1eae76613b43a93059c32c4a8435.zip frameworks_base-b509a809b20d1eae76613b43a93059c32c4a8435.tar.gz frameworks_base-b509a809b20d1eae76613b43a93059c32c4a8435.tar.bz2 | |
am fbd99e9f: am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
* commit 'fbd99e9fecea1cf467c082d2096cb1c3868685d4':
Avoid crashing on corrupted notifications.
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java index 59b62e5..57d162b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationTemplateViewWrapper.java @@ -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) { |