diff options
| author | 2023-09-07 20:29:15 +0000 | |
|---|---|---|
| committer | 2023-09-07 20:29:15 +0000 | |
| commit | 36b663d83dba6bdbb6ed77c1a8dd6f515e60eb6f (patch) | |
| tree | 3893e9b710cb4926eb72bde6601e09bf4ccc3e42 | |
| parent | 1ebfab808dbf08b0cae6f889a5a1127484ac4c4e (diff) | |
| parent | 318e1df16f46ee05317d3dcd46acf2ec3c9c532d (diff) | |
Merge "Fix NPE when fetch shortcut icon uri" into udc-dev am: 318e1df16f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24681253
Change-Id: I9bf776179b2e818019607d533d29f23fbbdac834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/ShortcutService.java | 4 |
1 files 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)); }); } |