Merge "Fixes an NPE in ShortcutService"

2022-01-19 18:10:33 +00:00
parent 41337865b5 f22bb743b4
commit a1e7c79a09
1 changed files with 2 additions and 2 deletions
--- 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);