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

Commit 76524da8 authored by Pinyao Ting's avatar Pinyao Ting
Browse files

Fix NPE when fetch shortcut icon uri 

Bug: 296980481
Test: atest CtsShortcutManagerTestCases
Change-Id: I7a2e85c703d2758f89b0c06d898f9423d6764444
Merged-In: I7a2e85c703d2758f89b0c06d898f9423d6764444
(cherry picked from commit 879e92bb)
(cherry picked from commit a1c34f0a)
parent 3b18ce15

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

+2 −2
Original line number Diff line number Diff line
@@ -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));

            });

        }