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

am: d3790e9dfa Change-Id: Ic11d92e3b653ab712c308a540908b257d5ffe45d
2017-05-15 17:52:12 +00:00
parent cf8591ff8b d3790e9dfa
commit 2ebfd1106c
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