From 98b0290bbe4205f774cd09360637af25d880add0 Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Thu, 14 May 2015 09:42:50 -0400 Subject: Fix icon-related crash. Bug: 21144636 Change-Id: Ib686e9a9a18ac6b9f1e249bcde74be9212e0f53b --- core/java/android/app/Notification.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 3ffeea7e3bd5..cb6f7d59f592 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3191,8 +3191,9 @@ public class Notification implements Parcelable 0xFFFFFFFF, PorterDuff.Mode.SRC_ATOP, -1); } - final boolean gray = (smallIcon.getType() == Icon.TYPE_RESOURCE - && mColorUtil.isGrayscaleIcon(mContext, smallIcon.getResId())); + final boolean gray = isLegacy() + && smallIcon.getType() == Icon.TYPE_RESOURCE + && mColorUtil.isGrayscaleIcon(mContext, smallIcon.getResId()); if (!isLegacy() || gray) { contentView.setInt(R.id.right_icon, "setBackgroundResource", -- cgit v1.2.3-59-g8ed1b