From 76524da868c0619ea2ce43e7ae94f1655945f8f1 Mon Sep 17 00:00:00 2001 From: Pinyao Ting Date: Thu, 24 Aug 2023 16:13:23 +0000 Subject: 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 | 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 dd434fbeecb4..3e4dd1637387 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 @@ public class ShortcutService extends IShortcutService.Stub { // 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)); }); } -- cgit v1.2.3-59-g8ed1b