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

Commit 2a83056e authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when fetch shortcut icon uri" into udc-dev am: 318e1df1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24681253



Change-Id: Ic3074485454982ac173c6be277274f0d6e979ff7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff0a17cb 318e1df1

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

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

            });

            });

        }

        }