fix: check height width before converting to bitmap (f5c37962) · Commits · e / os / android_frameworks_libs_systemui

iconloaderlib/src/com/android/launcher3/icons/BaseIconFactory.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -305,13 +305,19 @@ public class BaseIconFactory implements AutoCloseable {
		scale = getNormalizer().getScale(icon, outIconBounds, dr.getIconMask(), outShape);
		if (!(icon instanceof AdaptiveIconDrawable) && !outShape[0]) {
		FixedScaleDrawable fsd = ((FixedScaleDrawable) dr.getForeground());
		fsd.setDrawable(icon);

		int color;
		if (icon.getIntrinsicHeight() > 0 && icon.getIntrinsicWidth() > 0) {
		Bitmap bitmap = AdaptiveIconGenerator.toBitmap(icon);
		fsd.setScale(AdaptiveIconGenerator.getScale(bitmap, scale));
		color = ColorUtils.setAlphaComponent(new ColorExtractor().findDominantColorByHue(bitmap), 200);
		} else {
		fsd.setScale(scale);
		color = mWrapperBackgroundColor;
		}

		icon = dr;
		scale = getNormalizer().getScale(icon, outIconBounds, null, null);

		int color = ColorUtils.setAlphaComponent(new ColorExtractor().findDominantColorByHue(bitmap), 200);
		((ColorDrawable) dr.getBackground()).setColor(color);
		}
		} else {