diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-29 23:33:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-03-29 23:33:39 +0000 |
| commit | 44df60c3f9bb834d68391d83bd0159cd7c21ad2c (patch) | |
| tree | b3cd0a4089ab0874ecb5204debed8ce98d0cea65 /core/java | |
| parent | 68eab3f162ecf2c618b270cbad08cb4646d24c13 (diff) | |
| parent | e76404114219ac8015109dd3ec4d1d9b82af8e3c (diff) | |
Merge "Fall back when failing to load size restricted icon" into tm-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/widget/CachingIconView.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 |