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

Commit 644d0318 authored by Dan Sandler's avatar Dan Sandler Committed by Android Git Automerger
Browse files

am 5bcbf857: Merge "Fix icon-related crash." into mnc-dev 

* commit '5bcbf857':
  Fix icon-related crash.
parents e0efd004 5bcbf857

core/java/android/app/Notification.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -3191,8 +3191,9 @@ public class Notification implements Parcelable 
                        0xFFFFFFFF,

                        0xFFFFFFFF,

                        PorterDuff.Mode.SRC_ATOP, -1);

                        PorterDuff.Mode.SRC_ATOP, -1);

            }

            }

            final boolean gray = (smallIcon.getType() == Icon.TYPE_RESOURCE

            final boolean gray = isLegacy()

                    && mColorUtil.isGrayscaleIcon(mContext, smallIcon.getResId()));

                    && smallIcon.getType() == Icon.TYPE_RESOURCE

                    && mColorUtil.isGrayscaleIcon(mContext, smallIcon.getResId());

            if (!isLegacy() || gray) {

            if (!isLegacy() || gray) {

                contentView.setInt(R.id.right_icon,

                contentView.setInt(R.id.right_icon,

                        "setBackgroundResource",

                        "setBackgroundResource",