summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-09-28 23:21:09 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-09-28 23:21:09 +0000
commitdf4ce4d6c14cc0bfd26f20571e743fd2b1d6a363 (patch)
treebeaf800d3b60622a2bb9d35ee542cf3e0e3ce11a
parent8ddc17f325c54598473a3f0cf726358a1a8619c7 (diff)
parent79d6b30dce0eddcdecad4646018284a4db09829b (diff)
downloadandroid_packages_apps_Trebuchet-df4ce4d6c14cc0bfd26f20571e743fd2b1d6a363.tar.gz
android_packages_apps_Trebuchet-df4ce4d6c14cc0bfd26f20571e743fd2b1d6a363.tar.bz2
android_packages_apps_Trebuchet-df4ce4d6c14cc0bfd26f20571e743fd2b1d6a363.zip
Snap for 5907400 from 79d6b30dce0eddcdecad4646018284a4db09829b to qt-qpr1-release
Change-Id: I31f36b0866a15da09a999ea9a2dbf7e07e32fb6f
-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);