From e76404114219ac8015109dd3ec4d1d9b82af8e3c Mon Sep 17 00:00:00 2001
From: Garfield Tan <xutan@google.com>
Date: Wed, 23 Mar 2022 17:32:26 -0700
Subject: Fall back when failing to load size restricted icon

Bug: 226295380
Test: Notification still looks good.
Change-Id: Iff1b5ea18253bdc660731382da961f6b99ba33bd
---
 core/java/com/android/internal/widget/CachingIconView.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/widget/CachingIconView.java b/core/java/com/android/internal/widget/CachingIconView.java
index d1156979ee07..8ddd4ffd3065 100644
--- 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
-- 
cgit v1.2.3-59-g8ed1b