commit 76524da868c0619ea2ce43e7ae94f1655945f8f1
author Pinyao Ting <pinyaoting@google.com> Thu Aug 24 16:13:23 2023 +0000
committer Pinyao Ting <pinyaoting@google.com> Wed Sep 06 18:47:57 2023 +0000
tree 05e717c0ddf7a08d062ab60a7a6cc2440a1f7542
parent 3b18ce1510e0762cc56467ec7d4990ab45cc9bfc

Fix NPE when fetch shortcut icon uri

Bug: 296980481
Test: atest CtsShortcutManagerTestCases
Change-Id: I7a2e85c703d2758f89b0c06d898f9423d6764444
Merged-In: I7a2e85c703d2758f89b0c06d898f9423d6764444
(cherry picked from commit 879e92bb81de34d5d0eb341f67e0c2d6a8ba8b43)
(cherry picked from commit a1c34f0aac5acb50b1c912e2c96d9ef7a6a79348)

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