commit 5bcbf857d129f4513e562801a4e88077b2655ade
author Dan Sandler <dsandler@android.com> Thu May 14 15:10:01 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 14 15:10:03 2015 +0000
tree 4218424d6001a3df39e94829815af9461b2d862f
parent 9e2d14beb32bde5c5093f6fb0f1a5c8e14e41029
parent 98b0290bbe4205f774cd09360637af25d880add0

Merge "Fix icon-related crash." into mnc-dev

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 3ffeea7..cb6f7d5 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -3191,8 +3191,9 @@
                         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",