Merge "Guard against NPE inside BaseIconFactory Bug: 137253043" into ub-launcher3-qt-r1-dev (b1b4562a) · Commits · e / os / android_packages_apps_Trebuchet

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.graphics.drawable.Drawable;
		import android.os.Build;
		import android.os.Process;
		import android.os.UserHandle;
		import androidx.annotation.NonNull;

		/**
		* This class will be moved to androidx library. There shouldn't be any dependency outside
		@@ -154,7 +155,7 @@ public class BaseIconFactory implements AutoCloseable {
		* @param scale returns the scale result from normalization
		* @return a bitmap suitable for disaplaying as an icon at various system UIs.
		*/
		public BitmapInfo createBadgedIconBitmap(Drawable icon, UserHandle user,
		public BitmapInfo createBadgedIconBitmap(@NonNull Drawable icon, UserHandle user,
		boolean shrinkNonAdaptiveIcons, boolean isInstantApp, float[] scale) {
		if (scale == null) {
		scale = new float[1];
		@@ -207,8 +208,11 @@ public class BaseIconFactory implements AutoCloseable {
		mDisableColorExtractor = true;
		}

		private Drawable normalizeAndWrapToAdaptiveIcon(Drawable icon, boolean shrinkNonAdaptiveIcons,
		RectF outIconBounds, float[] outScale) {
		private Drawable normalizeAndWrapToAdaptiveIcon(@NonNull Drawable icon,
		boolean shrinkNonAdaptiveIcons, RectF outIconBounds, float[] outScale) {
		if (icon == null) {
		return null;
		}
		float scale = 1f;

		if (shrinkNonAdaptiveIcons && ATLEAST_OREO) {
		@@ -264,7 +268,7 @@ public class BaseIconFactory implements AutoCloseable {
		* @param icon drawable that should be flattened to a bitmap
		* @param scale the scale to apply before drawing {@param icon} on the canvas
		*/
		public Bitmap createIconBitmap(Drawable icon, float scale, int size) {
		public Bitmap createIconBitmap(@NonNull Drawable icon, float scale, int size) {
		Bitmap bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
		if (icon == null) {
		return bitmap;