commit 368621a4bb9081fc73af087b956918006c0826b4
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 11 23:00:05 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 11 23:00:05 2020 +0000
tree d4a88e4e793740958aa370dbd36fe3c7587e5048
parent 4aef7423142a301cd1cd10af78fe5a17105e0708
parent adbe9b60752cd463a1c31d15a6d122621c1cb6ab

Merge "ADD NPE check before shortcut key creation." into ub-launcher3-rvc-dev

src/com/android/launcher3/Utilities.java

diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 8e33406..bf63788 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -606,6 +606,7 @@
                 outObj[0] = activityInfo;
                 return activityInfo.getFullResIcon(appState.getIconCache());
             }
+            if (info.getIntent() == null || info.getIntent().getPackage() == null) return null;
             List<ShortcutInfo> si = ShortcutKey.fromItemInfo(info)
                     .buildRequest(launcher)
                     .query(ShortcutRequest.ALL);