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

Commit 15c855f9 authored by Mehdi Alizadeh's avatar Mehdi Alizadeh
Browse files

Fixes NPE when calling getPackage on a null shortcut 

Test: atest com.android.server.pm.ShortcutManagerTest1 \
            com.android.server.pm.ShortcutManagerTest2 \
            com.android.server.pm.ShortcutManagerTest3 \
            com.android.server.pm.ShortcutManagerTest4 \
            com.android.server.pm.ShortcutManagerTest5 \
            com.android.server.pm.ShortcutManagerTest6 \
            com.android.server.pm.ShortcutManagerTest7 \
            com.android.server.pm.ShortcutManagerTest8 \
            com.android.server.pm.ShortcutManagerTest9 \
            com.android.server.pm.ShortcutManagerTest10
Test: Launcher tests pass
Bug: 148869137

Change-Id: Idf27108e6b40106f4604bb5fa9d8061b5b8ce8be
parent 98549230

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

+1 −1
Original line number Diff line number Diff line
@@ -1985,7 +1985,6 @@ public class ShortcutService extends IShortcutService.Stub { 
            // Verify if caller is the shortcut owner, only if caller doesn't have ACCESS_SHORTCUTS.

            verifyShortcutInfoPackage(callingPackage, shortcut);

        }

        final String shortcutPackage = shortcut.getPackage();



        final boolean ret;

        synchronized (mLock) {
@@ -1999,6 +1998,7 @@ public class ShortcutService extends IShortcutService.Stub { 
            // someone already), then we just replace the existing one with this new one,

            // and then proceed the rest of the process.

            if (shortcut != null) {

                final String shortcutPackage = shortcut.getPackage();

                final ShortcutPackage ps = getPackageShortcutsForPublisherLocked(

                        shortcutPackage, userId);

                final String id = shortcut.getId();