Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)" into oc-dev

2017-05-15 17:36:09 +00:00
parent 9289faa163 8947f59f96
commit 10abacf3f3
1 changed files with 1 additions and 1 deletions
--- 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