Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bcbf857 authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

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

parents 9e2d14be 98b0290b

core/java/android/app/Notification.java

+3 −2
Original line number Diff line number Diff line
@@ -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",