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

Commit 344e90ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when fetch shortcut icon uri" into udc-qpr-dev am: a2cb2231 

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



Change-Id: I345980ca7c9352eb6561b6f6f6d5b7987e8bd743
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e7274b7 a2cb2231

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

            });

        }