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

Commit c50fe371 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by android-build-merger
Browse files

Merge "Fix NPE when trying to construct WorkspaceItemInfo with null intent... 

Merge "Fix NPE when trying to construct WorkspaceItemInfo with null intent data." into ub-launcher3-qt-qpr1-dev
am: 0e752faf

Change-Id: I11fc10b79d83971d7eeb466a619f50fc3fd5a637
parents 7ab1d09f 0e752faf

src/com/android/launcher3/InstallShortcutReceiver.java

+5 −0
Original line number Diff line number Diff line
@@ -619,6 +619,11 @@ public class InstallShortcutReceiver extends BroadcastReceiver { 
    }



    private static WorkspaceItemInfo createWorkspaceItemInfo(Intent data, LauncherAppState app) {

        if (data == null) {

            Log.e(TAG, "Can't construct WorkspaceItemInfo with null data");

            return null;

        }



        Intent intent = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT);

        String name = data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);

        Parcelable bitmap = data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON);