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

Commit a2cb2231 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 6c904be4 a1c34f0a

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

            });

        }