Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b091aa67 authored by Pinyao Ting's avatar Pinyao Ting Committed by Android Build Coastguard Worker
Browse files

Fix NPE when fetch shortcut icon uri 

Bug: 296980481
Test: atest CtsShortcutManagerTestCases
(cherry picked from commit 879e92bb)
(cherry picked from commit a1c34f0a)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76524da868c0619ea2ce43e7ae94f1655945f8f1)
Merged-In: I7a2e85c703d2758f89b0c06d898f9423d6764444
Change-Id: I7a2e85c703d2758f89b0c06d898f9423d6764444
parent 2a26787e

services/core/java/com/android/server/pm/ShortcutService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -3587,8 +3587,8 @@ public class ShortcutService extends IShortcutService.Stub { 




            // Otherwise check persisted shortcuts

            // Otherwise check persisted shortcuts

            getShortcutInfoAsync(launcherUserId, packageName, shortcutId, userId, si -> {

            getShortcutInfoAsync(launcherUserId, packageName, shortcutId, userId, si -> {

                cb.complete(getShortcutIconUriInternal(launcherUserId, launcherPackage,

                cb.complete(si == null ? null : getShortcutIconUriInternal(launcherUserId,

                        packageName, si, userId));

                        launcherPackage, packageName, si, userId));

            });

            });

        }

        }