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

Commit a1e7c79a authored by Pinyao Ting's avatar Pinyao Ting Committed by Android (Google) Code Review
Browse files

Merge "Fixes an NPE in ShortcutService"

parents 41337865 f22bb743

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

+2 −2
Original line number Diff line number Diff line
@@ -3474,8 +3474,8 @@ public class ShortcutService extends IShortcutService.Stub { 


        @Nullable

        private ParcelFileDescriptor getShortcutIconParcelFileDescriptor(

                @NonNull final ShortcutInfo shortcutInfo) {

            if (!shortcutInfo.hasIconFile()) {

                @Nullable final ShortcutInfo shortcutInfo) {

            if (shortcutInfo == null || !shortcutInfo.hasIconFile()) {

                return null;

            }

            final String path = mShortcutBitmapSaver.getBitmapPathMayWaitLocked(shortcutInfo);