summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2019-09-24 11:26:57 -0700
committerJonathan Miranda <jonmiranda@google.com>2019-09-24 18:30:44 +0000
commit79d6b30dce0eddcdecad4646018284a4db09829b (patch)
treebeaf800d3b60622a2bb9d35ee542cf3e0e3ce11a
parentd2d58656a4ac1da8580c3636a681f36cba0c1ba9 (diff)
downloadandroid_packages_apps_Trebuchet-79d6b30dce0eddcdecad4646018284a4db09829b.tar.gz
android_packages_apps_Trebuchet-79d6b30dce0eddcdecad4646018284a4db09829b.tar.bz2
android_packages_apps_Trebuchet-79d6b30dce0eddcdecad4646018284a4db09829b.zip
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
-rw-r--r--src/com/android/launcher3/InstallShortcutReceiver.java5
1 files changed, 5 insertions, 0 deletions
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);