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

Commit aa44e502 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Don't crash the notification bind if the icon fails to resolve." into sc-dev am: ccb14ac8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15017666

Change-Id: I94feee2f0c28f30068381a1475fc9745f912edc6
parents 78ecdb92 ccb14ac8

core/java/com/android/internal/widget/CachingIconView.java

+4 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ public class CachingIconView extends ImageView { 
        boolean hasColor = color != ColoredIconHelper.COLOR_INVALID;

        if (background == null) {

            // This is the pre-S style -- colored icon with no background.

            if (hasColor) {

            if (hasColor && icon != null) {

                icon.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);

            }

        } else {
@@ -265,7 +265,9 @@ public class CachingIconView extends ImageView { 
            // colorize the icon itself with the background color, creating an inverted effect.

            if (hasColor) {

                background.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);

                if (icon != null) {

                    icon.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP);

                }

            } else {

                background.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP);

            }