Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1240b2c0089b9b816cfd80b1d4efe4f4e910f73f
This commit is contained in:
Jeff DeCew
2021-06-23 14:28:15 +00:00
committed by Automerger Merge Worker
parent ee1eedbcc5 ccb14ac813
commit 9d5906690f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/widget/CachingIconView.java
View File

@@ -257,7 +257,7 @@ public class CachingIconView extends ImageView {
boolean hasColor = color != ColoredIconHelper.COLOR_INVALID; boolean hasColor = color != ColoredIconHelper.COLOR_INVALID;
if (background == null) { if (background == null) {
// This is the pre-S style -- colored icon with no background. // 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); icon.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
} }
} else { } else {
@@ -265,7 +265,9 @@ public class CachingIconView extends ImageView {
// colorize the icon itself with the background color, creating an inverted effect. // colorize the icon itself with the background color, creating an inverted effect.
if (hasColor) { if (hasColor) {
background.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP); background.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
icon.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP); if (icon != null) {
icon.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP);
}
} else { } else {
background.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP); background.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP);
} }