From 79d6b30dce0eddcdecad4646018284a4db09829b Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Tue, 24 Sep 2019 11:26:57 -0700 Subject: Fix NPE when trying to construct WorkspaceItemInfo with null intent data. We change the way we parse the install queue; so this seems to be a rare case when trying to flush an install queue from an old apk with a launcher apk with the new parsing changes. Bug: 140935140 Change-Id: I14db4c3f70ed2e1bc5ad31dec7e6473cd6f8f13c --- src/com/android/launcher3/InstallShortcutReceiver.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java index 670cd2877..f19c60268 100644 --- a/src/com/android/launcher3/InstallShortcutReceiver.java +++ b/src/com/android/launcher3/InstallShortcutReceiver.java @@ -631,6 +631,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); -- cgit v1.2.3