diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 0a2735cdbf760..057f8def17980 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -3474,8 +3474,8 @@ public class ShortcutService extends IShortcutService.Stub {
 
         @Nullable
         private ParcelFileDescriptor getShortcutIconParcelFileDescriptor(
-                @NonNull final ShortcutInfo shortcutInfo) {
-            if (!shortcutInfo.hasIconFile()) {
+                @Nullable final ShortcutInfo shortcutInfo) {
+            if (shortcutInfo == null || !shortcutInfo.hasIconFile()) {
                 return null;
             }
             final String path = mShortcutBitmapSaver.getBitmapPathMayWaitLocked(shortcutInfo);