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

Commit f22bb743 authored by Pinyao Ting's avatar Pinyao Ting
Browse files

Fixes an NPE in ShortcutService 

Bug: 213873270
Test: manual
Change-Id: If20e70f21c9b201f7e0cfd4904bfc8ff612a98f9
parent 2e6243d9

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