commit 752f0fe8a89d7e9189ce8bc9a7777dee16b882ff
author Hyunyoung Song <hyunyoungs@google.com> Mon May 15 10:12:11 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Mon May 15 19:55:13 2017 +0000
tree eccfdc2143b8932914016770a5cd7631d5298fc5
parent 7cf9e7fa0a42180e672cf5eb9d77d3aa1ef6dbbd

Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)

Change-Id: Ife64b1689813891c0b73eca7e586599013aad27a

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

diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index feeee3f..6d48a05 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 @@
                     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