diff options
| author | Dan Sandler <dsandler@android.com> | 2015-03-19 02:58:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-03-19 02:58:41 +0000 |
| commit | a14b2c42b23dc79480810010aa1dd5a40426c5e3 (patch) | |
| tree | ea89da2b2520f1c68dfe0730a18b793157d2b03e /packages | |
| parent | 03f5584ac09fc2f73a773fb2cbae70ade5472735 (diff) | |
| parent | 1ac28e18b417b286f05a44712acb1d5f00b56fb3 (diff) | |
| download | frameworks_base-a14b2c42b23dc79480810010aa1dd5a40426c5e3.zip frameworks_base-a14b2c42b23dc79480810010aa1dd5a40426c5e3.tar.gz frameworks_base-a14b2c42b23dc79480810010aa1dd5a40426c5e3.tar.bz2 | |
am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev
automerge: 1ac28e1
* commit '1ac28e18b417b286f05a44712acb1d5f00b56fb3':
Avoid crashing on corrupted notifications.
Diffstat (limited to 'packages')
| -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) { |