Fix icon-related crash.

Bug: 21144636
Change-Id: Ib686e9a9a18ac6b9f1e249bcde74be9212e0f53b

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 3ffeea7..cb6f7d5 100644 (file)
--- 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",