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

2015-05-14 15:10:01 +00:00
parent 9e2d14beb3 98b0290bbe
commit 5bcbf857d1
1 changed files with 3 additions and 2 deletions
--- 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",