diff options
| author | 2023-09-07 20:27:21 +0000 | |
|---|---|---|
| committer | 2023-09-07 20:27:21 +0000 | |
| commit | 2a83056e2e5b08c536986ea4ff0c46e9277a12c9 (patch) | |
| tree | 78fe69f9bea008ad97a0d081c94deec60df37dde | |
| parent | ff0a17cb197a6afe47f2dc28765f1492bd58b21d (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: Ic3074485454982ac173c6be277274f0d6e979ff7
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)); }); } |