Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 10abacf3f3

Change-Id: I1872725e46ac5ccf9f51d2a0818a93d55a094d01
This commit is contained in:
Hyunyoung Song
2017-05-15 17:41:38 +00:00
committed by android-build-merger
parent 061a71a0b4 10abacf3f3
commit d3790e9dfa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/ShortcutService.java
View File

@@ -1374,7 +1374,7 @@ public class ShortcutService extends IShortcutService.Stub {
case Icon.TYPE_ADAPTIVE_BITMAP: { case Icon.TYPE_ADAPTIVE_BITMAP: {
bitmap = icon.getBitmap(); // Don't recycle in this case. bitmap = icon.getBitmap(); // Don't recycle in this case.
maxIconDimension *= (1 + 2 * AdaptiveIconDrawable.getExtraInsetFraction()); maxIconDimension *= (1 + 2 * AdaptiveIconDrawable.getExtraInsetFraction());
break;
} }
default: default:
// This shouldn't happen because we've already validated the icon, but // This shouldn't happen because we've already validated the icon, but