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

Commit 36b663d8 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: I9bf776179b2e818019607d533d29f23fbbdac834
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ebfab80 318e1df1

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));

            });

        }