diff options
| author | Pinyao Ting <pinyaoting@google.com> | 2023-08-24 16:13:23 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-09-15 21:17:27 +0000 |
| commit | b091aa67982efe8386f2cc257e2edee5f3efb048 (patch) | |
| tree | 13003924a762bc16394f83aa828f4d40269babba | |
| parent | 2a26787eed78beda40c553f6b45e86409fed3c3a (diff) | |
| download | base-b091aa67982efe8386f2cc257e2edee5f3efb048.tar.gz | |
Fix NPE when fetch shortcut icon uri
Bug: 296980481
Test: atest CtsShortcutManagerTestCases
(cherry picked from commit 879e92bb81de34d5d0eb341f67e0c2d6a8ba8b43)
(cherry picked from commit a1c34f0aac5acb50b1c912e2c96d9ef7a6a79348)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76524da868c0619ea2ce43e7ae94f1655945f8f1)
Merged-In: I7a2e85c703d2758f89b0c06d898f9423d6764444
Change-Id: I7a2e85c703d2758f89b0c06d898f9423d6764444
| -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 5b3514c01f9f..01bceb190c2e 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -3587,8 +3587,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)); }); } |