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

Commit 8947f59f authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

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

b/38304824
Test: cts tests in ag/2262246 and also full build and tried the system image.

Change-Id: I8f021aa2bb1a0e99597bc00064ab1e9d85569bcb
parent 54ddf4a4

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