Merge "Fall back when failing to load size restricted icon" into tm-dev (44df60c3) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/CachingIconView.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -122,8 +122,11 @@ public class CachingIconView extends ImageView {
		public Runnable setImageIconAsync(@Nullable final Icon icon) {
		resetCache();
		Drawable drawable = loadSizeRestrictedIcon(icon);
		if (drawable != null) {
		return () -> setImageDrawable(drawable);
		}
		return super.setImageIconAsync(icon);
		}

		@Override
		@RemotableViewMethod(asyncImpl="setImageResourceAsync")