From f22bb743b4d0a49384387c2732d03e52ef40ade8 Mon Sep 17 00:00:00 2001
From: Pinyao Ting <pinyaoting@google.com>
Date: Wed, 19 Jan 2022 05:09:54 +0000
Subject: [PATCH] Fixes an NPE in ShortcutService

Bug: 213873270
Test: manual
Change-Id: If20e70f21c9b201f7e0cfd4904bfc8ff612a98f9
---
 services/core/java/com/android/server/pm/ShortcutService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);