From 8947f59f964fba9f06a34297ba4a8f63ac2d3e4a Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Mon, 15 May 2017 10:12:11 -0700 Subject: [PATCH] Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts) b/38304824 Test: cts tests in ag/2262246 and also full build and tried the system image. Change-Id: I8f021aa2bb1a0e99597bc00064ab1e9d85569bcb --- services/core/java/com/android/server/pm/ShortcutService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index feeee3f28eb83..6d48a05273cbd 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -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