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

Commit adf5e468 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Don't crash the notification bind if the icon fails to resolve. 

Bug: 189924598
Test: reproduce the bug and notice that instead of an empty collapsed state, you get everything except the icon.
Change-Id: Ibc4bebf0bbf42192ce70b748f98725e312fa54b8
parent e7fc7576

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);

            }