From adbe9b60752cd463a1c31d15a6d122621c1cb6ab Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 11 Jun 2020 15:15:02 -0700 Subject: [PATCH] ADD NPE check before shortcut key creation. Bug: 156871815 Change-Id: I88132a51f80062eaa76da5838d20c5fe93224635 --- src/com/android/launcher3/Utilities.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 8e33406ed5..bf637886b7 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -606,6 +606,7 @@ public final class Utilities { outObj[0] = activityInfo; return activityInfo.getFullResIcon(appState.getIconCache()); } + if (info.getIntent() == null || info.getIntent().getPackage() == null) return null; List si = ShortcutKey.fromItemInfo(info) .buildRequest(launcher) .query(ShortcutRequest.ALL);