diff options
| author | 2017-05-15 17:36:09 +0000 | |
|---|---|---|
| committer | 2017-05-15 17:36:16 +0000 | |
| commit | 10abacf3f356ad99a0457957c58a79a4af04f08f (patch) | |
| tree | 24301d0c0d3abbfa8b88e4c0ffcb94dde4018a10 | |
| parent | 9289faa163b2c4ea449cf466cd29dac061647b3e (diff) | |
| parent | 8947f59f964fba9f06a34297ba4a8f63ac2d3e4a (diff) | |
Merge "Fix Shortcut crash due to invalid Icon type (e.g., all adaptive bitmap shortcuts)" into oc-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/ShortcutService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index feeee3f28eb8..6d48a05273cb 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 |