Merge "Fall back when failing to load size restricted icon" into tm-dev

2022-03-29 23:33:39 +00:00
parent 68eab3f162 e764041142
commit 44df60c3f9
1 changed files with 4 additions and 1 deletions
--- a/core/java/com/android/internal/widget/CachingIconView.java
+++ b/core/java/com/android/internal/widget/CachingIconView.java
@@ -122,7 +122,10 @@ public class CachingIconView extends ImageView {
    public Runnable setImageIconAsync(@Nullable final Icon icon) {
        resetCache();
        Drawable drawable = loadSizeRestrictedIcon(icon);
-        return () -> setImageDrawable(drawable);
+        if (drawable != null) {
+            return () -> setImageDrawable(drawable);
+        }
+        return super.setImageIconAsync(icon);
    }

    @Override