Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ebfd110 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

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

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

Change-Id: Ic11d92e3b653ab712c308a540908b257d5ffe45d
parents cf8591ff d3790e9d

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

+1 −1
Original line number Diff line number Diff line
@@ -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