commit 318e1df16f46ee05317d3dcd46acf2ec3c9c532d
author Pinyao Ting <pinyaoting@google.com> Thu Sep 07 19:50:15 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 07 19:50:15 2023 +0000
tree 05e717c0ddf7a08d062ab60a7a6cc2440a1f7542
parent 03e7be403fc02956089f9ecfb007a86ecfb185a0
parent 76524da868c0619ea2ce43e7ae94f1655945f8f1

Merge "Fix NPE when fetch shortcut icon uri" into udc-dev

services/core/java/com/android/server/pm/ShortcutService.java

diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index dd434fbe..3e4dd16 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -3611,8 +3611,8 @@
 
             // Otherwise check persisted shortcuts
             getShortcutInfoAsync(launcherUserId, packageName, shortcutId, userId, si -> {
-                cb.complete(getShortcutIconUriInternal(launcherUserId, launcherPackage,
-                        packageName, si, userId));
+                cb.complete(si == null ? null : getShortcutIconUriInternal(launcherUserId,
+                        launcherPackage, packageName, si, userId));
             });
         }