Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap... (10abacf3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/ShortcutService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1374,7 +1374,7 @@ public class ShortcutService extends IShortcutService.Stub {
		case Icon.TYPE_ADAPTIVE_BITMAP: {
		bitmap = icon.getBitmap(); // Don't recycle in this case.
		maxIconDimension = (1 + 2 AdaptiveIconDrawable.getExtraInsetFraction());

		break;
		}
		default:
		// This shouldn't happen because we've already validated the icon, but